diff --git a/osu-framework b/osu-framework
index 1ba1e8ef1e..d492c2ffe6 160000
--- a/osu-framework
+++ b/osu-framework
@@ -1 +1 @@
-Subproject commit 1ba1e8ef1e5ec0466632be02492023a081cb85ab
+Subproject commit d492c2ffe6ce5dac2a8e05118d86e6907186329b
diff --git a/osu.Game/Overlays/ChatOverlay.cs b/osu.Game/Overlays/ChatOverlay.cs
index 38432860c3..b20019ed1a 100644
--- a/osu.Game/Overlays/ChatOverlay.cs
+++ b/osu.Game/Overlays/ChatOverlay.cs
@@ -334,7 +334,15 @@ namespace osu.Game.Overlays
 
             set
             {
-                if (currentChannel == value || value == null) return;
+                if (currentChannel == value) return;
+
+                if (value == null)
+                {
+                    currentChannel = null;
+                    textbox.Current.Disabled = true;
+                    currentChannelContainer.Clear(false);
+                    return;
+                }
 
                 currentChannel = value;
 
@@ -397,11 +405,7 @@ namespace osu.Game.Overlays
         {
             if (channel == null) return;
 
-            if (channel == CurrentChannel)
-            {
-                currentChannel = null;
-                currentChannelContainer.Clear(false);
-            }
+            if (channel == CurrentChannel) CurrentChannel = null;
 
             careChannels.Remove(channel);
             loadedChannels.Remove(loadedChannels.Find(c => c.Channel == channel));