diff --git a/osu.Game/Overlays/ChatOverlay.cs b/osu.Game/Overlays/ChatOverlay.cs
index d3277fb0a9..47262068d1 100644
--- a/osu.Game/Overlays/ChatOverlay.cs
+++ b/osu.Game/Overlays/ChatOverlay.cs
@@ -339,13 +339,26 @@ namespace osu.Game.Overlays
             this.channelManager = channelManager;
             channelManager.CurrentChannel.ValueChanged += currentChannelChanged;
             channelManager.JoinedChannels.CollectionChanged += joinedChannelsChanged;
-            channelManager.AvailableChannels.CollectionChanged += (sender, args) => channelSelection.UpdateAvailableChannels(channelManager.AvailableChannels);
+            channelManager.AvailableChannels.CollectionChanged += availableChannelsChanged;
 
             //for the case that channelmanager was faster at fetching the channels than our attachment to CollectionChanged.
             channelSelection.UpdateAvailableChannels(channelManager.AvailableChannels);
             joinedChannelsChanged(this, new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Add, channelManager.JoinedChannels));
         }
 
+        private void availableChannelsChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            channelSelection.UpdateAvailableChannels(channelManager.AvailableChannels);
+        }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+            channelManager.CurrentChannel.ValueChanged -= currentChannelChanged;
+            channelManager.JoinedChannels.CollectionChanged -= joinedChannelsChanged;
+            channelManager.AvailableChannels.CollectionChanged -= availableChannelsChanged;
+        }
+
         private void postMessage(TextBox textbox, bool newText)
         {
             var text = textbox.Text.Trim();