diff --git a/src/main/fc/fc_core.c b/src/main/fc/fc_core.c
index ae1b0bb065..e4eab1a982 100644
--- a/src/main/fc/fc_core.c
+++ b/src/main/fc/fc_core.c
@@ -206,11 +206,12 @@ void updateArmingStatus(void)
             unsetArmingDisabled(ARMING_DISABLED_CALIBRATING);
         }
 
-        if ((isModeActivationConditionPresent(BOXPREARM) && IS_RC_MODE_ACTIVE(BOXPREARM) && !ARMING_FLAG(WAS_ARMED_WITH_PREARM))
-            || !isModeActivationConditionPresent(BOXPREARM)) {
-            unsetArmingDisabled(ARMING_DISABLED_NOPREARM);
-        } else {
-            setArmingDisabled(ARMING_DISABLED_NOPREARM);
+        if (isModeActivationConditionPresent(BOXPREARM)) {
+            if (IS_RC_MODE_ACTIVE(BOXPREARM) && !ARMING_FLAG(WAS_ARMED_WITH_PREARM)) {
+                unsetArmingDisabled(ARMING_DISABLED_NOPREARM);
+            } else {
+                setArmingDisabled(ARMING_DISABLED_NOPREARM);
+            }
         }
 
         if (!isUsingSticksForArming()) {