diff --git a/src/lib/tunes/tunes.cpp b/src/lib/tunes/tunes.cpp
index 2440511e74..8765f63ed4 100644
--- a/src/lib/tunes/tunes.cpp
+++ b/src/lib/tunes/tunes.cpp
@@ -105,12 +105,12 @@ void Tunes::set_control(const tune_control_s &tune_control)
 	switch (tune_control.tune_id) {
 	case tune_control_s::TUNE_ID_STARTUP:
 	case tune_control_s::TUNE_ID_ERROR:
-		reset_playing_tune = true;
-		config_tone();
-
 	case tune_control_s::TUNE_ID_NOTIFY_POSITIVE:
 	case tune_control_s::TUNE_ID_NOTIFY_NEUTRAL:
 	case tune_control_s::TUNE_ID_NOTIFY_NEGATIVE:
+		reset_playing_tune = true;
+		config_tone();
+
 	case tune_control_s::TUNE_ID_ARMING_WARNING:
 	case tune_control_s::TUNE_ID_BATTERY_WARNING_SLOW:
 	case tune_control_s::TUNE_ID_BATTERY_WARNING_FAST: