diff --git a/radio/src/audio_arm.cpp b/radio/src/audio_arm.cpp
index 3fff37af0..47038961f 100644
--- a/radio/src/audio_arm.cpp
+++ b/radio/src/audio_arm.cpp
@@ -870,7 +870,7 @@ void audioEvent(uint8_t e, uint16_t f)
           break;
         // timer == 0
         case AU_TIMER_00:
-          audioQueue.play(BEEP_DEFAULT_FREQ+150, 240, 20, PLAY_NOW);
+          audioQueue.play(BEEP_DEFAULT_FREQ+150, 300, 20, PLAY_NOW);
           break;
         // timer <= 10 seconds left
         case AU_TIMER_LT10:
diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp
index 6103305d1..7f1824352 100644
--- a/radio/src/opentx.cpp
+++ b/radio/src/opentx.cpp
@@ -3989,7 +3989,10 @@ void doMixerCalculations()
         switch(timerState->state)
         {
           case TMR_RUNNING:
-            if (tv && newTimerVal>=(int16_t)tv) timerState->state = TMR_NEGATIVE;
+            if (tv && newTimerVal>=(int16_t)tv) {
+              AUDIO_TIMER_00(g_model.timers[i].countdownBeep);
+              timerState->state = TMR_NEGATIVE;
+            }
             break;
           case TMR_NEGATIVE:
             if (newTimerVal >= (int16_t)tv + MAX_ALERT_TIME) timerState->state = TMR_STOPPED;
@@ -4004,7 +4007,6 @@ void doMixerCalculations()
             if (g_model.timers[i].countdownBeep && g_model.timers[i].start) {
               if (newTimerVal==30) AUDIO_TIMER_30();
               if (newTimerVal==20) AUDIO_TIMER_20();
-              if (newTimerVal==00) AUDIO_TIMER_00(g_model.timers[i].countdownBeep);
               if (newTimerVal<=10) AUDIO_TIMER_LT10(g_model.timers[i].countdownBeep, newTimerVal);
             }
             if (g_model.timers[i].minuteBeep && (newTimerVal % 60)==0) {