diff --git a/src/main/io/beeper.c b/src/main/io/beeper.c
index 7a0e1d6b98..e7ec349649 100644
--- a/src/main/io/beeper.c
+++ b/src/main/io/beeper.c
@@ -185,7 +185,7 @@ static const beeperTableEntry_t *currentBeeperEntry = NULL;
  */
 void beeper(beeperMode_e mode)
 {
-    if (mode == BEEPER_SILENCE || (mode == BEEPER_USB && (feature(FEATURE_VBAT) && (batteryCellCount < 2)))) {
+    if (mode == BEEPER_SILENCE || ((getBeeperOffMask() & (1 << (BEEPER_USB-1))) && (feature(FEATURE_VBAT) && (batteryCellCount < 2)))) {
         beeperSilence();
         return;
     }