diff --git a/osu.Game/Screens/Select/FilterControl.cs b/osu.Game/Screens/Select/FilterControl.cs
index d49d0c57e6..fcaacef97b 100644
--- a/osu.Game/Screens/Select/FilterControl.cs
+++ b/osu.Game/Screens/Select/FilterControl.cs
@@ -224,7 +224,6 @@ namespace osu.Game.Screens.Select
             {
                 base.LoadComplete();
 
-                beatmaps.CollectionChanged += filterBeatmapsChanged;
                 Current.BindValueChanged(filterChanged, true);
             }
 
@@ -247,11 +246,15 @@ namespace osu.Game.Screens.Select
             /// </summary>
             private void filterChanged(ValueChangedEvent<CollectionFilter> filter)
             {
+                beatmaps.CollectionChanged -= filterBeatmapsChanged;
+
                 if (filter.OldValue?.Collection != null)
                     beatmaps.UnbindFrom(filter.OldValue.Collection.Beatmaps);
 
                 if (filter.NewValue?.Collection != null)
                     beatmaps.BindTo(filter.NewValue.Collection.Beatmaps);
+
+                beatmaps.CollectionChanged += filterBeatmapsChanged;
             }
 
             /// <summary>