diff --git a/stepmania/src/RageSounds.cpp b/stepmania/src/RageSounds.cpp
index 30d7dd5962..0a933f5c4e 100644
--- a/stepmania/src/RageSounds.cpp
+++ b/stepmania/src/RageSounds.cpp
@@ -87,6 +87,9 @@ void StartPlayingQueuedMusic( const RageTimer &when, const MusicToPlay &ToPlay,
 
 void StartQueuedMusic( MusicToPlay &ToPlay )
 {
+	if( ToPlay.file.empty() )
+		return;
+
 	LockMutex L( *g_Mutex );
 	MusicPlaying *NewMusic = new MusicPlaying;
 	NewMusic->m_Timing = g_Playing->m_Timing;
@@ -297,10 +300,6 @@ void RageSounds::PlayMusic( const CString &file, const CString &timing_file, boo
 
 	g_Playing->m_Music.Unload();
 
-	/* If file is blank, just stop. */
-	if( file.empty() )
-		return;
-
 	MusicToPlay ToPlay;
 
 	ToPlay.file = file;