diff --git a/src/main/interface/msp.c b/src/main/interface/msp.c
index e4600c60a..b4754ce6a 100644
--- a/src/main/interface/msp.c
+++ b/src/main/interface/msp.c
@@ -1779,6 +1779,9 @@ static mspResult_e mspProcessInCommand(uint8_t cmdMSP, sbuf_t *src)
             const uint8_t command = sbufReadU8(src);
             if (command) {
                 setArmingDisabled(ARMING_DISABLED_MSP);
+                if (ARMING_FLAG(ARMED)) {
+                    disarm();
+                }
             } else {
                 unsetArmingDisabled(ARMING_DISABLED_MSP);
             }