diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs
index 546f7a1ec4..212d4d4850 100644
--- a/osu.Game/Overlays/MusicController.cs
+++ b/osu.Game/Overlays/MusicController.cs
@@ -262,7 +262,11 @@ namespace osu.Game.Overlays
             {
                 if (beatmap is Bindable<WorkingBeatmap> working)
                     working.Value = beatmaps.GetWorkingBeatmap(playable.Beatmaps.First(), beatmap.Value);
-                beatmap.Value.Track.Restart();
+
+                // if not scheduled, the previously track will be stopped one frame later (see ScheduleAfterChildren logic in GameBase).
+                // we probably want to move this to a central method for switching to a new working beatmap in the future.
+                Schedule(() => beatmap.Value.Track.Restart());
+
                 return true;
             }