diff --git a/osu.Game/Overlays/Chat/ChatTabControl.cs b/osu.Game/Overlays/Chat/ChatTabControl.cs
index c668f78ff4..5c09e81726 100644
--- a/osu.Game/Overlays/Chat/ChatTabControl.cs
+++ b/osu.Game/Overlays/Chat/ChatTabControl.cs
@@ -48,8 +48,10 @@ namespace osu.Game.Overlays.Chat
         }
 
         public void AddItem(Channel channel)
-        {
-            ChannelTabControl.AddItem(channel);
+        { 
+            if (!ChannelTabControl.Items.Contains(channel))
+                ChannelTabControl.AddItem(channel);
+
             if (Current.Value == null)
                 Current.Value = channel;
         }
diff --git a/osu.Game/Overlays/Chat/DrawableChannel.cs b/osu.Game/Overlays/Chat/DrawableChannel.cs
index 8cc77f82f3..cfefff9067 100644
--- a/osu.Game/Overlays/Chat/DrawableChannel.cs
+++ b/osu.Game/Overlays/Chat/DrawableChannel.cs
@@ -55,15 +55,11 @@ namespace osu.Game.Overlays.Chat
             Channel.PendingMessageResolved += pendingMessageResolved;
         }
 
-        [BackgroundDependencyLoader]
-        private void load()
-        {
-            newMessagesArrived(Channel.Messages);
-        }
-
         protected override void LoadComplete()
         {
             base.LoadComplete();
+
+            newMessagesArrived(Channel.Messages);
             scrollToEnd();
         }
 
diff --git a/osu.Game/Overlays/Chat/Selection/ChannelSelectionOverlay.cs b/osu.Game/Overlays/Chat/Selection/ChannelSelectionOverlay.cs
index df4a8f5d24..e2d064474f 100644
--- a/osu.Game/Overlays/Chat/Selection/ChannelSelectionOverlay.cs
+++ b/osu.Game/Overlays/Chat/Selection/ChannelSelectionOverlay.cs
@@ -125,23 +125,26 @@ namespace osu.Game.Overlays.Chat.Selection
 
         public void UpdateAvailableChannels(IEnumerable<Channel> channels)
         {
-            sectionsFlow.ChildrenEnumerable = new[]
+            Scheduler.Add(() =>
             {
-                new ChannelSection
+                sectionsFlow.ChildrenEnumerable = new[]
                 {
-                    Header = "All Channels",
-                    Channels = channels,
-                },
-            };
+                    new ChannelSection
+                    {
+                        Header = "All Channels",
+                        Channels = channels,
+                    },
+                };
 
-            foreach (ChannelSection s in sectionsFlow.Children)
-            {
-                foreach (ChannelListItem c in s.ChannelFlow.Children)
+                foreach (ChannelSection s in sectionsFlow.Children)
                 {
-                    c.OnRequestJoin = channel => { OnRequestJoin?.Invoke(channel); };
-                    c.OnRequestLeave = channel => { OnRequestLeave?.Invoke(channel); };
+                    foreach (ChannelListItem c in s.ChannelFlow.Children)
+                    {
+                        c.OnRequestJoin = channel => { OnRequestJoin?.Invoke(channel); };
+                        c.OnRequestLeave = channel => { OnRequestLeave?.Invoke(channel); };
+                    }
                 }
-            }
+            });
         }
 
         [BackgroundDependencyLoader]