diff --git a/osu-framework b/osu-framework
index f8899f9d10..45bff5838d 160000
--- a/osu-framework
+++ b/osu-framework
@@ -1 +1 @@
-Subproject commit f8899f9d1043ed74481eba2d9bf89c3c5ee38ddf
+Subproject commit 45bff5838d133d918547e90bd74c9d0d5fadecc1
diff --git a/osu.Game/Screens/Select/PlaySongSelect.cs b/osu.Game/Screens/Select/PlaySongSelect.cs
index 944b20eb65..3a74c42029 100644
--- a/osu.Game/Screens/Select/PlaySongSelect.cs
+++ b/osu.Game/Screens/Select/PlaySongSelect.cs
@@ -317,22 +317,17 @@ namespace osu.Game.Screens.Select
             ensurePlayingSelected(beatmapSetChange);
         }
 
-        private async Task ensurePlayingSelected(bool preview = false)
+        private void ensurePlayingSelected(bool preview = false)
         {
-            AudioTrack track = null;
+            AudioTrack track = Beatmap?.Track;
 
-            await Task.Run(() => track = Beatmap?.Track);
-
-            Schedule(delegate
+            if (track != null)
             {
-                if (track != null)
-                {
-                    trackManager.SetExclusive(track);
-                    if (preview)
-                        track.Seek(Beatmap.Beatmap.Metadata.PreviewTime);
-                    track.Start();
-                }
-            });
+                trackManager.SetExclusive(track);
+                if (preview)
+                    track.Seek(Beatmap.Beatmap.Metadata.PreviewTime);
+                track.Start();
+            }
         }
 
         private void addBeatmapSet(BeatmapSetInfo beatmapSet, BaseGame game)