diff --git a/OpenRA.Mods.Common/Traits/World/MusicPlaylist.cs b/OpenRA.Mods.Common/Traits/World/MusicPlaylist.cs
index 9fe6ea235a..d0bc536470 100644
--- a/OpenRA.Mods.Common/Traits/World/MusicPlaylist.cs
+++ b/OpenRA.Mods.Common/Traits/World/MusicPlaylist.cs
@@ -66,9 +66,7 @@ namespace OpenRA.Mods.Common.Traits
 			random = playlist.Shuffle(Game.CosmeticRandom).ToArray();
 			IsMusicAvailable = playlist.Any();
 
-			if (SongExists(info.StartingMusic))
-				currentSong = world.Map.Rules.Music[info.StartingMusic];
-			else if (SongExists(info.BackgroundMusic))
+			if (SongExists(info.BackgroundMusic))
 			{
 				currentSong = currentBackgroundSong = world.Map.Rules.Music[info.BackgroundMusic];
 				CurrentSongIsBackground = true;
@@ -81,6 +79,12 @@ namespace OpenRA.Mods.Common.Traits
 					currentSong = random.FirstOrDefault();
 			}
 
+			if (SongExists(info.StartingMusic))
+			{
+				currentSong = world.Map.Rules.Music[info.StartingMusic];
+				CurrentSongIsBackground = false;
+			}
+
 			Play();
 		}