diff --git a/NebulaWorld/MonoBehaviours/Local/Chat/ChatWindow.cs b/NebulaWorld/MonoBehaviours/Local/Chat/ChatWindow.cs
index a674b744c..dfddf42f8 100644
--- a/NebulaWorld/MonoBehaviours/Local/Chat/ChatWindow.cs
+++ b/NebulaWorld/MonoBehaviours/Local/Chat/ChatWindow.cs
@@ -213,8 +213,12 @@ public ChatMessage SendLocalChatMessage(string text, ChatMessageType messageType
                     break;
                 case ChatMessageType.PlayerMessagePrivate:
                     break;
+                case ChatMessageType.SystemInfoMessage when Config.Options.EnableInfoMessage:
+                    break;
+                case ChatMessageType.SystemWarnMessage when Config.Options.EnableWarnMessage:
+                    break;
                 default:
-                    throw new ArgumentOutOfRangeException(nameof(messageType), messageType, null);
+                    throw new ArgumentOutOfRangeException(nameof(messageType), "Invalid message type: " + messageType);
             }
         }