diff --git a/osu.Game/Screens/Select/PlaySongSelect.cs b/osu.Game/Screens/Select/PlaySongSelect.cs
index 3255491ea7..1fa6d9d3a6 100644
--- a/osu.Game/Screens/Select/PlaySongSelect.cs
+++ b/osu.Game/Screens/Select/PlaySongSelect.cs
@@ -91,7 +91,7 @@ namespace osu.Game.Screens.Select
 
         private void start()
         {
-            if (player != null)
+            if (player != null || Beatmap == null)
                 return;
 
             //in the future we may want to move this logic to a PlayerLoader gamemode or similar, so we can rely on the SongSelect transition