diff --git a/osu.Game/Overlays/Chat/Tabs/ChannelTabControl.cs b/osu.Game/Overlays/Chat/Tabs/ChannelTabControl.cs
index e30c1678d5..4e6bc48b8a 100644
--- a/osu.Game/Overlays/Chat/Tabs/ChannelTabControl.cs
+++ b/osu.Game/Overlays/Chat/Tabs/ChannelTabControl.cs
@@ -59,17 +59,12 @@ namespace osu.Game.Overlays.Chat.Tabs
 
         /// <summary>
         /// Adds a channel to the ChannelTabControl.
-        /// The first channel added will automaticly selected if <paramref name="setChannel"/> is true.
         /// </summary>
         /// <param name="channel">The channel that is going to be added.</param>
-        /// <param name="setChannel">If the current channel should be changed if none was selected before</param>
-        public void AddChannel(Channel channel, bool setChannel = true)
+        public void AddChannel(Channel channel)
         {
             if (!Items.Contains(channel))
                 AddItem(channel);
-
-            if (Current.Value == null && setChannel)
-                Current.Value = channel;
         }
 
         /// <summary>
diff --git a/osu.Game/Overlays/ChatOverlay.cs b/osu.Game/Overlays/ChatOverlay.cs
index 9bd9f89665..3eba0811e3 100644
--- a/osu.Game/Overlays/ChatOverlay.cs
+++ b/osu.Game/Overlays/ChatOverlay.cs
@@ -222,13 +222,10 @@ namespace osu.Game.Overlays
                 channelManager.JoinedChannels.ItemsAdded += onChannelAddedToJoinedChannels;
                 channelManager.JoinedChannels.ItemsRemoved += onChannelRemovedFromJoinedChannels;
 
-                bool channelSelected = channelManager.CurrentChannel.Value != null;
-
                 foreach (Channel channel in channelManager.JoinedChannels)
-                    ChannelTabControl.AddChannel(channel, !channelSelected);
+                    ChannelTabControl.AddChannel(channel);
 
-                if (channelSelected)
-                    ChannelTabControl.Current.Value = channelManager.CurrentChannel.Value;
+                ChannelTabControl.Current.Value = channelManager.CurrentChannel.Value ?? channelManager.JoinedChannels.First();
 
                 channelManager.AvailableChannels.ItemsAdded += availableChannelsChanged;
                 channelManager.AvailableChannels.ItemsRemoved += availableChannelsChanged;