diff --git a/src/Tgstation.Server.Host/Components/Chat/ChatManager.cs b/src/Tgstation.Server.Host/Components/Chat/ChatManager.cs
index 3aaf187d80..c5f68d45fd 100644
--- a/src/Tgstation.Server.Host/Components/Chat/ChatManager.cs
+++ b/src/Tgstation.Server.Host/Components/Chat/ChatManager.cs
@@ -316,6 +316,7 @@ namespace Tgstation.Server.Host.Components.Chat
 					Name = newSettings.Name,
 					ReconnectionInterval = newSettings.ReconnectionInterval,
 					Provider = newSettings.Provider,
+					Channels = newSettings.Channels,
 				});
 			}
 
@@ -822,7 +823,15 @@ namespace Tgstation.Server.Host.Components.Chat
 						{
 							var localActiveProcessingTask = activeProcessingTask;
 							using (LogContext.PushProperty("ChatMessage", messageNumber))
-								await ProcessMessage(completedMessageTaskKvp.Key, message, cancellationToken).ConfigureAwait(false);
+								try
+								{
+									await ProcessMessage(completedMessageTaskKvp.Key, message, cancellationToken).ConfigureAwait(false);
+								}
+								catch (Exception ex)
+								{
+									logger.LogError(ex, "Error processing message {messageNumber}!", messageNumber);
+								}
+
 							await localActiveProcessingTask.ConfigureAwait(false);
 						}