diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp
index fd30af6a6a..ac1110ccb6 100644
--- a/stepmania/src/ScreenGameplay.cpp
+++ b/stepmania/src/ScreenGameplay.cpp
@@ -779,6 +779,8 @@ ScreenGameplay::~ScreenGameplay()
 		m_pSoundMusic->StopPlaying();
 
 	m_soundAssistTick.StopPlaying(); /* Stop any queued assist ticks. */
+
+	NSMAN->ReportSongOver();
 }
 
 bool ScreenGameplay::IsLastSong()
@@ -2467,9 +2469,6 @@ void ScreenGameplay::TweenOffScreen()
 	m_textDebug.StopTweening();
 	m_textDebug.BeginTweening( 1/8.f );
 	m_textDebug.SetDiffuse( RageColor(1,1,1,0) );
-
-	
-	NSMAN->ReportSongOver();
 }
 
 void ScreenGameplay::ShowOniGameOver( PlayerNumber pn )