diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs
index 4faa339bed..f1be55801f 100644
--- a/osu.Game/Overlays/MusicController.cs
+++ b/osu.Game/Overlays/MusicController.cs
@@ -266,24 +266,27 @@ namespace osu.Game.Overlays
         {
             progressBar.IsEnabled = beatmap != null;
 
-            bool audioEquals = beatmapBacking.Value?.BeatmapInfo?.AudioEquals(current?.BeatmapInfo) ?? false;
+            TransformDirection direction = TransformDirection.None;
 
-            TransformDirection direction;
-
-            if (audioEquals)
-                direction = TransformDirection.None;
-            else if (queuedDirection.HasValue)
+            if (current != null)
             {
-                direction = queuedDirection.Value;
-                queuedDirection = null;
-            }
-            else
-            {
-                //figure out the best direction based on order in playlist.
-                var last = current == null ? -1 : playlist.BeatmapSets.TakeWhile(b => b.ID != current.BeatmapSetInfo.ID).Count();
-                var next = beatmapBacking.Value == null ? -1 : playlist.BeatmapSets.TakeWhile(b => b.ID != beatmapBacking.Value.BeatmapSetInfo.ID).Count();
+                bool audioEquals = beatmapBacking.Value?.BeatmapInfo?.AudioEquals(current.BeatmapInfo) ?? false;
 
-                direction = last > next ? TransformDirection.Prev : TransformDirection.Next;
+                if (audioEquals)
+                    direction = TransformDirection.None;
+                else if (queuedDirection.HasValue)
+                {
+                    direction = queuedDirection.Value;
+                    queuedDirection = null;
+                }
+                else
+                {
+                    //figure out the best direction based on order in playlist.
+                    var last = playlist.BeatmapSets.TakeWhile(b => b.ID != current.BeatmapSetInfo.ID).Count();
+                    var next = beatmapBacking.Value == null ? -1 : playlist.BeatmapSets.TakeWhile(b => b.ID != beatmapBacking.Value.BeatmapSetInfo.ID).Count();
+
+                    direction = last > next ? TransformDirection.Prev : TransformDirection.Next;
+                }
             }
 
             current = beatmapBacking.Value;