diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp
index c985c53d17..0fca3ec553 100644
--- a/stepmania/src/ScreenSelectMusic.cpp
+++ b/stepmania/src/ScreenSelectMusic.cpp
@@ -1268,7 +1268,8 @@ void ScreenSelectMusic::AfterMusicChange()
 	}
 
 	Song* pSong = m_MusicWheel.GetSelectedSong();
-	GAMESTATE->m_pCurSong = pSong;
+	if( pSong )
+		GAMESTATE->m_pCurSong = pSong;
 
 	m_GrooveGraph.SetFromSong( pSong );