diff --git a/stepmania/src/ScreenAttract.cpp b/stepmania/src/ScreenAttract.cpp
index 9991b8e505..634d28eb87 100644
--- a/stepmania/src/ScreenAttract.cpp
+++ b/stepmania/src/ScreenAttract.cpp
@@ -101,7 +101,7 @@ void ScreenAttract::StartPlayingMusic()
 {
 	if( !GAMESTATE->IsTimeToPlayAttractSounds() )
 	{
-		SOUND->PlayMusic( "" ); // stop music
+		SOUND->StopMusic();
 		return;
 	}
 
@@ -130,7 +130,7 @@ void ScreenAttract::HandleScreenMessage( const ScreenMessage SM )
 			bMusicChanging = THEME->GetPathS(m_sName,"music") != THEME->GetPathS(GetNextScreen(),"music",true);	// GetPath optional on the next screen because it may not have music.
 
 		if( bMusicChanging )
-			SOUND->PlayMusic( "" );	// stop the music
+			SOUND->StopMusic();
 	}
 
 	ScreenWithMenuElements::HandleScreenMessage( SM );
diff --git a/stepmania/src/ScreenEdit.cpp b/stepmania/src/ScreenEdit.cpp
index 6bf64b6460..23e9116625 100644
--- a/stepmania/src/ScreenEdit.cpp
+++ b/stepmania/src/ScreenEdit.cpp
@@ -750,7 +750,6 @@ void ScreenEdit::PlayTicks()
 
 void ScreenEdit::PlayPreviewMusic()
 {
-	SOUND->PlayMusic("");
 	SOUND->PlayMusic( 
 		m_pSong->GetMusicPath(), 
 		NULL,
@@ -1851,7 +1850,7 @@ void ScreenEdit::TransitionEditState( EditState em )
 	}
 
 	/* If we're playing music, sample music or assist ticks when changing modes, stop. */
-	SOUND->PlayMusic("");
+	SOUND->StopMusic();
 	m_soundMusic.StopPlaying();
 	m_soundAssistTick.StopPlaying();
 	GAMESTATE->m_bPastHereWeGo = false;