diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index 431e6c91f9..b9e2b79b05 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -307,11 +307,10 @@ private void beatmapChanged(ValueChangedEvent<WorkingBeatmap> beatmap)
             if (nextBeatmap?.Track != null)
                 nextBeatmap.Track.Completed += currentTrackCompleted;
 
-            var oldBeatmap = beatmap.OldValue;
-            if (oldBeatmap?.Track != null)
-                oldBeatmap.Track.Completed -= currentTrackCompleted;
+            using (var oldBeatmap = beatmap.OldValue)
+                if (oldBeatmap?.Track != null)
+                    oldBeatmap.Track.Completed -= currentTrackCompleted;
 
-            oldBeatmap?.Dispose();
             nextBeatmap?.LoadBeatmapAsync();
         }