diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index bed4c98b53..a96768629e 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -188,17 +188,19 @@ namespace osu.Game
         {
             CloseAllOverlays(false);
 
-            Beatmap.Value = BeatmapManager.GetWorkingBeatmap(beatmap.Beatmaps.First());
+            void setBeatmap() => Beatmap.Value = BeatmapManager.GetWorkingBeatmap(beatmap.Beatmaps.First());
 
             switch (currentScreen)
             {
                 case SongSelect _:
+                    setBeatmap();
                     break;
                 default:
                     // navigate to song select if we are not already there.
                     var menu = (MainMenu)intro.ChildScreen;
 
                     menu.MakeCurrent();
+                    setBeatmap();
                     menu.LoadToSolo();
                     break;
             }