diff --git a/src/Tgstation.Server.Host/Components/Chat/ChatManager.cs b/src/Tgstation.Server.Host/Components/Chat/ChatManager.cs
index 2782f9aba1..94e01c8af5 100644
--- a/src/Tgstation.Server.Host/Components/Chat/ChatManager.cs
+++ b/src/Tgstation.Server.Host/Components/Chat/ChatManager.cs
@@ -646,7 +646,8 @@ namespace Tgstation.Server.Host.Components.Chat
 		public async Task StopAsync(CancellationToken cancellationToken)
 		{
 			handlerCts.Cancel();
-			await chatHandler.ConfigureAwait(false);
+			if (chatHandler != null)
+				await chatHandler.ConfigureAwait(false);
 			await Task.WhenAll(providers.Select(x => x.Value).Select(x => x.Disconnect(cancellationToken))).ConfigureAwait(false);
 		}