diff --git a/P3D/Screens/BattleIntroScreen.vb b/P3D/Screens/BattleIntroScreen.vb
index 892504ee1..9badca24a 100644
--- a/P3D/Screens/BattleIntroScreen.vb
+++ b/P3D/Screens/BattleIntroScreen.vb
@@ -547,7 +547,8 @@
         Player.Temp.BeforeBattleFacing = Screen.Camera.GetPlayerFacingDirection()
         Dim b As BattleSystem.BattleScreen = CType(Me.NewScreen, BattleSystem.BattleScreen)
 
-        MusicManager.ClearCurrentlyPlaying()
+        MusicManager.Playlist.Clear()
+        MusicManager.outputDevice.Stop()
         If BattleSystem.BattleScreen.CustomBattleMusic = "" OrElse MusicManager.SongExists(BattleSystem.BattleScreen.CustomBattleMusic) = False Then
             If b.IsPVPBattle = True Then
                 MusicManager.Play(MusicLoop, False, 0.0F, True, "pvp")