diff --git a/osu.Game/Beatmaps/IWorkingBeatmapCache.cs b/osu.Game/Beatmaps/IWorkingBeatmapCache.cs
index e28f802e78..3eb33f10d6 100644
--- a/osu.Game/Beatmaps/IWorkingBeatmapCache.cs
+++ b/osu.Game/Beatmaps/IWorkingBeatmapCache.cs
@@ -1,10 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-#nullable disable
-
-using System;
-
 namespace osu.Game.Beatmaps
 {
     public interface IWorkingBeatmapCache
@@ -27,10 +23,5 @@ namespace osu.Game.Beatmaps
         /// </summary>
         /// <param name="beatmapInfo">The beatmap info to invalidate any cached entries for.</param>
         void Invalidate(BeatmapInfo beatmapInfo);
-
-        /// <summary>
-        /// Fired whenever a <see cref="WorkingBeatmap"/> is invalidated.
-        /// </summary>
-        event Action<WorkingBeatmap> OnInvalidated;
     }
 }
diff --git a/osu.Game/Screens/Select/SongSelect.cs b/osu.Game/Screens/Select/SongSelect.cs
index 73bcabba31..7abcbfca42 100644
--- a/osu.Game/Screens/Select/SongSelect.cs
+++ b/osu.Game/Screens/Select/SongSelect.cs
@@ -296,24 +296,8 @@ namespace osu.Game.Screens.Select
             base.LoadComplete();
 
             modSelectOverlayRegistration = OverlayManager?.RegisterBlockingOverlay(ModSelect);
-
-            beatmaps.OnInvalidated += workingBeatmapInvalidated;
         }
 
-        private void workingBeatmapInvalidated(WorkingBeatmap working) => Scheduler.AddOnce(w =>
-        {
-            // The global beatmap may have already been updated (ie. by the editor).
-            // Only perform the actual switch if we still need to.
-            if (w == Beatmap.Value)
-            {
-                // Not sure if this refresh is required.
-                var beatmapInfo = beatmaps.QueryBeatmap(b => b.ID == w.BeatmapInfo.ID);
-                Beatmap.Value = beatmaps.GetWorkingBeatmap(beatmapInfo);
-            }
-
-            updateComponentFromBeatmap(Beatmap.Value);
-        }, working);
-
         /// <summary>
         /// Creates the buttons to be displayed in the footer.
         /// </summary>
@@ -719,8 +703,6 @@ namespace osu.Game.Screens.Select
                 music.TrackChanged -= ensureTrackLooping;
 
             modSelectOverlayRegistration?.Dispose();
-
-            beatmaps.OnInvalidated -= workingBeatmapInvalidated;
         }
 
         /// <summary>