diff --git a/src/modules/commander/Safety.cpp b/src/modules/commander/Safety.cpp
index 6cb9bc1809..8abf304535 100644
--- a/src/modules/commander/Safety.cpp
+++ b/src/modules/commander/Safety.cpp
@@ -44,16 +44,16 @@ Safety::Safety()
 {
 	// Safety can be turned off with the CBRK_IO_SAFETY parameter.
 	_safety_disabled = circuit_breaker_enabled("CBRK_IO_SAFETY", CBRK_IO_SAFETY_KEY);
+
+	if (_safety_disabled) {
+		_button_available = true;
+		_safety_off = true;
+	}
 }
 
 bool Safety::safetyButtonHandler()
 {
-	if (_safety_disabled) {
-		_button_available = true;
-		_safety_off = true;
-
-	} else {
-
+	if (!_safety_disabled) {
 		if (!_button_available && _safety_button_sub.advertised()) {
 			_button_available = true;
 		}