diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp
index e65f14276d..e7c964d1f7 100644
--- a/stepmania/src/ScreenSelectMusic.cpp
+++ b/stepmania/src/ScreenSelectMusic.cpp
@@ -1426,10 +1426,11 @@ void ScreenSelectMusic::AfterMusicChange()
 	{
 		GAMESTATE->m_pCurSteps[p].Set( NULL );
 		GAMESTATE->m_pCurTrail[p].Set( NULL );
-		m_vpSteps.clear();
-		m_vpTrails.clear();
 	}
 
+	m_vpSteps.clear();
+	m_vpTrails.clear();
+
 	m_Banner.SetMovingFast( !!m_MusicWheel.IsMoving() );
 
 	vector<RString> m_Artists, m_AltArtists;