diff --git a/src/modules/systemlib/circuit_breaker.cpp b/src/modules/systemlib/circuit_breaker.cpp
index ba9e9f6219..c5a94a43bd 100644
--- a/src/modules/systemlib/circuit_breaker.cpp
+++ b/src/modules/systemlib/circuit_breaker.cpp
@@ -48,9 +48,10 @@
 
 bool circuit_breaker_enabled(const char *breaker, int32_t magic)
 {
-	int32_t val;
-	(void)PX4_PARAM_GET_BYNAME(breaker, &val);
-
-	return (val == magic);
+	int32_t val = -1;
+	if (PX4_PARAM_GET_BYNAME(breaker, &val) == 0 && val == magic) {
+		return true;
+	}
+	return false;
 }