diff --git a/osu.Game/Overlays/ChatOverlay.cs b/osu.Game/Overlays/ChatOverlay.cs
index 7430ab8923..2e6f143e74 100644
--- a/osu.Game/Overlays/ChatOverlay.cs
+++ b/osu.Game/Overlays/ChatOverlay.cs
@@ -324,9 +324,7 @@ namespace osu.Game.Overlays
 
             set
             {
-                if (currentChannel == value) return;
-
-                if (channelTabs.ChannelSelectorActive) return;
+                if (currentChannel == value || value == null) return;
 
                 currentChannel = value;