diff --git a/src/sdl/mixer_sound.c b/src/sdl/mixer_sound.c
index 38de05032..ac94dd748 100644
--- a/src/sdl/mixer_sound.c
+++ b/src/sdl/mixer_sound.c
@@ -1263,6 +1263,8 @@ boolean I_PlaySong(boolean looping)
 
 void I_StopSong(void)
 {
+	I_StopFadingSong();
+
 #ifdef HAVE_LIBGME
 	if (gme)
 	{
@@ -1272,12 +1274,12 @@ void I_StopSong(void)
 #endif
 	if (music)
 	{
-		var_cleanup();
-		I_StopFadingSong();
 		Mix_UnregisterEffect(MIX_CHANNEL_POST, count_music_bytes);
 		Mix_HookMusicFinished(NULL);
 		Mix_HaltMusic();
 	}
+
+	var_cleanup();
 }
 
 void I_PauseSong()