diff --git a/src/main.c b/src/main.c
index 29268d6..fd8d76b 100644
--- a/src/main.c
+++ b/src/main.c
@@ -174,33 +174,36 @@ static void update_countdown_fsm(uint32_t time_ms)
 					sseg_set_pwm_times(0, 255, 0);
 					sseg_set_pwm_times(1, 255, 0);
 					sseg_set_pwm_times(2, 255, 0);
+
+					buzzer_on(2963);
 					break;
 
 				case 500:
 					sseg_set_char(0, '#', false);
-					buzzer_on(1000);
+					buzzer_on(3951);
 					break;
 
 				case 1000:
 					sseg_set_char(1, '|', false);
-					buzzer_on(1414);
+					buzzer_on(2963);
 					break;
 
 				case 1500:
 					sseg_set_char(1, '#', false);
-					buzzer_on(2000);
+					buzzer_on(1976);
 					break;
 
 				case 2000:
 					sseg_set_char(2, '|', false);
-					buzzer_on(2828);
+					buzzer_on(2963);
 					break;
 
 				case 2500:
 					sseg_set_char(2, '#', false);
-					buzzer_on(4000);
+					buzzer_on(3951);
 					break;
 
+				case 200:
 				case 700:
 				case 1200:
 				case 1700:
@@ -254,6 +257,9 @@ static void update_countdown_fsm(uint32_t time_ms)
 				if((m_countdown_off_time - time_ms) > 10 * ONE_HOUR) {
 					m_countdown_off_time = time_ms + 10 * ONE_HOUR;
 				}
+
+				// ensure the buzzer is off after the time was extended
+				buzzer_off();
 			}
 
 			// beep codes