diff --git a/osu.Game/Overlays/Music/PlaylistOverlay.cs b/osu.Game/Overlays/Music/PlaylistOverlay.cs
index 23bec53014..d913895159 100644
--- a/osu.Game/Overlays/Music/PlaylistOverlay.cs
+++ b/osu.Game/Overlays/Music/PlaylistOverlay.cs
@@ -13,7 +13,6 @@ using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using OpenTK;
 using OpenTK.Graphics;
-using System.Threading;
 
 namespace osu.Game.Overlays.Music
 {
@@ -153,11 +152,6 @@ namespace osu.Game.Overlays.Music
             var track = beatmapBacking.Value.Track;
 
             track.Restart();
-
-            // this is temporary until we have blocking (async.Wait()) audio component methods.
-            // then we can call RestartAsync().Wait() or the blocking version above.
-            while (!track.IsRunning)
-                Thread.Sleep(1);
         }
     }
 
diff --git a/osu.Game/Screens/Play/Player.cs b/osu.Game/Screens/Play/Player.cs
index e9992f2df7..c7111e57f2 100644
--- a/osu.Game/Screens/Play/Player.cs
+++ b/osu.Game/Screens/Play/Player.cs
@@ -327,11 +327,6 @@ namespace osu.Game.Screens.Play
             {
                 adjustableSourceClock.Reset();
 
-                // this is temporary until we have blocking (async.Wait()) audio component methods.
-                // then we can call ResetAsync().Wait() or the blocking version above.
-                while (adjustableSourceClock.IsRunning)
-                    Thread.Sleep(1);
-
                 Schedule(() =>
                 {
                     decoupledClock.ChangeSource(adjustableSourceClock);