diff --git a/Firmware/sound.cpp b/Firmware/sound.cpp
index 27c951b97..bd157d0d8 100644
--- a/Firmware/sound.cpp
+++ b/Firmware/sound.cpp
@@ -65,27 +65,12 @@ Sound_SaveMode();
 //if critical is true then silend and once mode is ignored
 void Sound_MakeCustom(uint16_t ms,uint16_t tone_,bool critical){
     backlight_wake();
-     if (!critical){
-          if (eSoundMode != e_SOUND_MODE_SILENT){
-               if(!tone_){
-                    WRITE(BEEPER, HIGH);
-                    _delay(ms);
-                    WRITE(BEEPER, LOW);
-               }
-               else{
-                    _tone(BEEPER, tone_);
-                    _delay(ms);
-                    _noTone(BEEPER);
-               }
-          }
-     }
-     else{
-          if(!tone_){
+     if (critical || eSoundMode != e_SOUND_MODE_SILENT) {
+          if(!tone_) {
                WRITE(BEEPER, HIGH);
                _delay(ms);
                WRITE(BEEPER, LOW);
-          }
-          else{
+          } else {
                _tone(BEEPER, tone_);
                _delay(ms);
                _noTone(BEEPER);