diff --git a/src/main/config/config.c b/src/main/config/config.c
index 1dc25b3341..12a463d46f 100755
--- a/src/main/config/config.c
+++ b/src/main/config/config.c
@@ -1085,9 +1085,8 @@ void beeperOffSet(uint32_t mask)
     masterConfig.beeper_off_flags |= mask;
 }
 
-void beeperOffSetAll(void)
+void beeperOffSetAll(uint8_t beeperCount)
 {
-    uint8_t beeperCount = beeperTableEntryCount() - 2;
     uint32_t mask = 0;
 	for (int i = 0; i < beeperCount; i++){
 		mask |= (1 << i);
diff --git a/src/main/config/config.h b/src/main/config/config.h
index 9368bf0951..7cb16dc900 100644
--- a/src/main/config/config.h
+++ b/src/main/config/config.h
@@ -55,7 +55,7 @@ void featureClear(uint32_t mask);
 void featureClearAll(void);
 uint32_t featureMask(void);
 void beeperOffSet(uint32_t mask);
-void beeperOffSetAll(void);
+void beeperOffSetAll(uint8_t beeperCount);
 void beeperOffClear(uint32_t mask);
 void beeperOffClearAll(void);
 uint32_t getBeeperOffMask(void);
diff --git a/src/main/io/serial_cli.c b/src/main/io/serial_cli.c
index d70d8ce624..94c97295c8 100644
--- a/src/main/io/serial_cli.c
+++ b/src/main/io/serial_cli.c
@@ -2135,7 +2135,7 @@ static void cliBeeper(char *cmdline)
             if (strncasecmp(cmdline, beeperNameForTableIndex(i), len) == 0) {
                 if (remove) { // beeper off
                     if (i == BEEPER_ALL-1)
-                        beeperOffSetAll();
+                        beeperOffSetAll(beeperCount-2);
                     else
                     	if (i == BEEPER_PREFERENCE-1)
                             setBeeperOffMask(getPreferedBeeperOffMask());