diff --git a/osu.Android.props b/osu.Android.props
index 596e5bfa8b..b95b794004 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -52,6 +52,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.602.0" />
-    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.609.0" />
+    <PackageReference Include="ppy.osu.Framework.Android" Version="2020.616.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/Overlays/Chat/Tabs/ChannelTabControl.cs b/osu.Game/Overlays/Chat/Tabs/ChannelTabControl.cs
index cb6abb7cc6..19c6f437b6 100644
--- a/osu.Game/Overlays/Chat/Tabs/ChannelTabControl.cs
+++ b/osu.Game/Overlays/Chat/Tabs/ChannelTabControl.cs
@@ -78,19 +78,10 @@ namespace osu.Game.Overlays.Chat.Tabs
         /// <param name="channel">The channel that is going to be removed.</param>
         public void RemoveChannel(Channel channel)
         {
-            if (Current.Value == channel)
-            {
-                var allChannels = TabContainer.AllTabItems.Select(tab => tab.Value).ToList();
-                var isNextTabSelector = allChannels[allChannels.IndexOf(channel) + 1] == selectorTab.Value;
-
-                // selectorTab is not switchable, so we have to explicitly select it if it's the only tab left
-                if (isNextTabSelector && allChannels.Count == 2)
-                    SelectTab(selectorTab);
-                else
-                    SwitchTab(isNextTabSelector ? -1 : 1);
-            }
-
             RemoveItem(channel);
+
+            if (SelectedTab == null)
+                SelectTab(selectorTab);
         }
 
         protected override void SelectTab(TabItem<Channel> tab)
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 1d3bafbfd6..6ec57e5100 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -24,7 +24,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2020.609.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.616.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.602.0" />
     <PackageReference Include="Sentry" Version="2.1.3" />
     <PackageReference Include="SharpCompress" Version="0.25.1" />
diff --git a/osu.iOS.props b/osu.iOS.props
index ad7850599b..0bfff24805 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -70,7 +70,7 @@
     <Reference Include="System.Net.Http" />
   </ItemGroup>
   <ItemGroup Label="Package References">
-    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.609.0" />
+    <PackageReference Include="ppy.osu.Framework.iOS" Version="2020.616.0" />
     <PackageReference Include="ppy.osu.Game.Resources" Version="2020.602.0" />
   </ItemGroup>
   <!-- Xamarin.iOS does not automatically handle transitive dependencies from NuGet packages. -->
@@ -80,7 +80,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-    <PackageReference Include="ppy.osu.Framework" Version="2020.609.0" />
+    <PackageReference Include="ppy.osu.Framework" Version="2020.616.0" />
     <PackageReference Include="SharpCompress" Version="0.25.1" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="SharpRaven" Version="2.4.0" />