diff --git a/src/main/fc/runtime_config.c b/src/main/fc/runtime_config.c
index a49236077e..c8bae0d854 100644
--- a/src/main/fc/runtime_config.c
+++ b/src/main/fc/runtime_config.c
@@ -32,8 +32,8 @@ static uint32_t enabledSensors = 0;
 #if defined(OSD) || !defined(MINIMAL_CLI)
 const char *armingDisableFlagNames[]= {
     "NOGYRO", "FAILSAFE", "RXLOSS", "BADRX", "BOXFAILSAFE",
-    "THROTTLE", "ANGLE", "BOOTGRACE", "NOPREARM", "ARMSWITCH",
-    "LOAD", "CALIB", "CLI", "CMS", "OSD", "BST", "MSP"
+    "THROTTLE", "ANGLE", "BOOTGRACE", "NOPREARM", "LOAD",
+    "CALIB", "CLI", "CMS", "OSD", "BST", "MSP", "ARMSWITCH"
 };
 #endif
 
diff --git a/src/main/fc/runtime_config.h b/src/main/fc/runtime_config.h
index 15181c0d53..3fb13b8c3f 100644
--- a/src/main/fc/runtime_config.h
+++ b/src/main/fc/runtime_config.h
@@ -44,14 +44,14 @@ typedef enum {
     ARMING_DISABLED_ANGLE           = (1 << 6),
     ARMING_DISABLED_BOOT_GRACE_TIME = (1 << 7),
     ARMING_DISABLED_NOPREARM        = (1 << 8),
-    ARMING_DISABLED_ARM_SWITCH      = (1 << 9),
-    ARMING_DISABLED_LOAD            = (1 << 10),
-    ARMING_DISABLED_CALIBRATING     = (1 << 11),
-    ARMING_DISABLED_CLI             = (1 << 12),
-    ARMING_DISABLED_CMS_MENU        = (1 << 13),
-    ARMING_DISABLED_OSD_MENU        = (1 << 14),
-    ARMING_DISABLED_BST             = (1 << 15),
-    ARMING_DISABLED_MSP             = (1 << 16)
+    ARMING_DISABLED_LOAD            = (1 << 9),
+    ARMING_DISABLED_CALIBRATING     = (1 << 10),
+    ARMING_DISABLED_CLI             = (1 << 11),
+    ARMING_DISABLED_CMS_MENU        = (1 << 12),
+    ARMING_DISABLED_OSD_MENU        = (1 << 13),
+    ARMING_DISABLED_BST             = (1 << 14),
+    ARMING_DISABLED_MSP             = (1 << 15),
+    ARMING_DISABLED_ARM_SWITCH      = (1 << 16), // Needs to be the last element, since it's always activated if one of the others is active when arming
 } armingDisableFlags_e;
 
 #define NUM_ARMING_DISABLE_FLAGS 17