diff --git a/src/lib/tunes/tunes.cpp b/src/lib/tunes/tunes.cpp
index 643ec41d5b..d0b4646038 100644
--- a/src/lib/tunes/tunes.cpp
+++ b/src/lib/tunes/tunes.cpp
@@ -88,6 +88,7 @@ void Tunes::config_tone(bool repeat_flag)
 int Tunes::set_control(const tune_control_s &tune_control)
 {
 	bool reset_playing_tune = false;
+	_repeat = false;
 
 	if (tune_control.tune_id < _default_tunes_size) {
 		switch (tune_control.tune_id) {
diff --git a/src/lib/tunes/tunes.h b/src/lib/tunes/tunes.h
index f384c8b271..f8a27280e0 100644
--- a/src/lib/tunes/tunes.h
+++ b/src/lib/tunes/tunes.h
@@ -96,7 +96,7 @@ private:
 	static const char *_default_tunes[];
 	static const uint8_t _note_tab[];
 	static const unsigned int _default_tunes_size;
-	bool _repeat;	///< if true, tune restarts at end
+	bool _repeat = false;	     ///< if true, tune restarts at end
 
 	const char *_tune = nullptr; ///< current tune string
 	const char *_next = nullptr; ///< next note in the string