diff --git a/osu.Game/Audio/PreviewTrack.cs b/osu.Game/Audio/PreviewTrack.cs
index 5de2f2551d..fad4731f18 100644
--- a/osu.Game/Audio/PreviewTrack.cs
+++ b/osu.Game/Audio/PreviewTrack.cs
@@ -28,7 +28,7 @@ public abstract class PreviewTrack : Component
         private void load()
         {
             track = GetTrack();
-            track.Completed += Stop;
+            track.Completed += () => Schedule(Stop);
         }
 
         /// <summary>
diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs
index 6a71e91de9..7fbb7ec41e 100644
--- a/osu.Game/Overlays/MusicController.cs
+++ b/osu.Game/Overlays/MusicController.cs
@@ -351,11 +351,11 @@ private void beatmapChanged(ValueChangedEvent<WorkingBeatmap> beatmap)
             queuedDirection = null;
         }
 
-        private void currentTrackCompleted()
+        private void currentTrackCompleted() => Schedule(() =>
         {
             if (!beatmap.Disabled && beatmapSets.Any())
                 next();
-        }
+        });
 
         private ScheduledDelegate pendingBeatmapSwitch;