diff --git a/src/main/io/beeper.c b/src/main/io/beeper.c
index dd52af5b1f..177d2a7fef 100755
--- a/src/main/io/beeper.c
+++ b/src/main/io/beeper.c
@@ -364,19 +364,20 @@ void beeperUpdate(timeUs_t currentTimeUs)
         return;
     }
 
-#ifdef USE_DSHOT
-    if (!areMotorsRunning() && beeperConfig()->dshotBeaconTone && (beeperConfig()->dshotBeaconTone <= DSHOT_CMD_BEACON5) && (currentBeeperEntry->mode == BEEPER_RX_SET || currentBeeperEntry->mode == BEEPER_RX_LOST)) {
-        pwmDisableMotors();
-        delay(1);
-
-        pwmWriteDshotCommand(ALL_MOTORS, getMotorCount(), beeperConfig()->dshotBeaconTone);
-
-        pwmEnableMotors();
-    }
-#endif
-
     if (!beeperIsOn) {
         beeperIsOn = 1;
+
+#ifdef USE_DSHOT
+        if (!areMotorsRunning() && beeperConfig()->dshotBeaconTone && (beeperConfig()->dshotBeaconTone <= DSHOT_CMD_BEACON5) && (currentBeeperEntry->mode == BEEPER_RX_SET || currentBeeperEntry->mode == BEEPER_RX_LOST)) {
+            pwmDisableMotors();
+            delay(1);
+
+            pwmWriteDshotCommand(ALL_MOTORS, getMotorCount(), beeperConfig()->dshotBeaconTone);
+
+            pwmEnableMotors();
+        }
+#endif
+
         if (currentBeeperEntry->sequence[beeperPos] != 0) {
             if (!(getBeeperOffMask() & (1 << (currentBeeperEntry->mode - 1))))
                 BEEP_ON;