diff --git a/music_gui.c b/music_gui.c
index a5e9b3957e..42a807579f 100644
--- a/music_gui.c
+++ b/music_gui.c
@@ -181,10 +181,13 @@ void MusicLoop(void)
 	if (_song_is_active == false)
 		return;
 
-	if (!_music_driver->is_song_playing() && _game_mode != GM_MENU) {
-		StopMusic();
-		SkipToNextSong();
-		PlayPlaylistSong();
+	if (!_music_driver->is_song_playing()) {
+		if (_game_mode != GM_MENU) {
+			StopMusic();
+			SkipToNextSong();
+			PlayPlaylistSong();
+		} else
+			ResetMusic();
 	}
 }