diff --git a/src/Tgstation.Server.Host/Components/Chat/Chat.cs b/src/Tgstation.Server.Host/Components/Chat/Chat.cs
index e11d311609..191988addc 100644
--- a/src/Tgstation.Server.Host/Components/Chat/Chat.cs
+++ b/src/Tgstation.Server.Host/Components/Chat/Chat.cs
@@ -546,7 +546,7 @@ namespace Tgstation.Server.Host.Components.Chat
 			{
 				trackingContexts.Add(context);
 				lock (mappedChannels)
-					task = Task.WhenAll(trackingContexts.Select(x => x.SetChannels(mappedChannels.Select(y => y.Value.Channel), cancellationToken)));
+					task = context.SetChannels(mappedChannels.Select(y => y.Value.Channel), cancellationToken);
 			}
 			await task.ConfigureAwait(false);
 			return context;