diff --git a/Mage.Server/src/main/java/mage/server/ChatManager.java b/Mage.Server/src/main/java/mage/server/ChatManager.java
index 6ade71332d1..ac0e7a6821f 100644
--- a/Mage.Server/src/main/java/mage/server/ChatManager.java
+++ b/Mage.Server/src/main/java/mage/server/ChatManager.java
@@ -128,7 +128,7 @@ public class ChatManager {
 
             if (!messageType.equals(MessageType.GAME)) {
 
-                if (userName != null && !userName.equals("")) {
+                if (message != null && userName != null && !userName.equals("")) {
                     if (message.equals(userMessages.get(userName))) {
                         // prevent identical messages
                         return;