diff --git a/src/CommandHandlers/GenericMessageHandler.cs b/src/CommandHandlers/GenericMessageHandler.cs
index cd7fb60..e634bb0 100644
--- a/src/CommandHandlers/GenericMessageHandler.cs
+++ b/src/CommandHandlers/GenericMessageHandler.cs
@@ -7,6 +7,8 @@ namespace sodoffmmo.CommandHandlers;
 [CommandHandler(7)]
 class GenericMessageHandler : CommandHandler {
     public override Task Handle(Client client, NetworkObject receivedObject) {
+        if (!Configuration.ServerConfiguration.EnableChat && receivedObject.Get<string>("m").StartsWith("C:"))
+            return Task.CompletedTask;
         NetworkPacket packet = NetworkObject.WrapObject(0, 7, receivedObject).Serialize();
         client.Room.Send(packet);
         return Task.CompletedTask;