diff --git a/src/main/interface/msp.c b/src/main/interface/msp.c
index 3b3480a297..1977408eb6 100644
--- a/src/main/interface/msp.c
+++ b/src/main/interface/msp.c
@@ -40,6 +40,7 @@
 #include "config/feature.h"
 #include "pg/pg.h"
 #include "pg/pg_ids.h"
+#include "pg/beeper.h"
 
 #include "drivers/accgyro/accgyro.h"
 #include "drivers/bus_i2c.h"
@@ -473,6 +474,7 @@ static bool mspCommonProcessOutCommand(uint8_t cmdMSP, sbuf_t *dst, mspPostProce
 #ifdef BEEPER
     case MSP_BEEPER_CONFIG:
         sbufWriteU32(dst, getBeeperOffMask());
+        sbufWriteU8(dst, beeperConfig()->dshotBeaconTone);
         break;
 #endif
 
@@ -1839,6 +1841,9 @@ static mspResult_e mspProcessInCommand(uint8_t cmdMSP, sbuf_t *src)
     case MSP_SET_BEEPER_CONFIG:
         beeperOffClearAll();
         setBeeperOffMask(sbufReadU32(src));
+        if (sbufBytesRemaining(src) >= 1) {
+            beeperConfigMutable()->dshotBeaconTone = sbufReadU8(src);
+        }
         break;
 #endif