diff --git a/src/main/java/net/minecraft/server/NetServerHandler.java b/src/main/java/net/minecraft/server/NetServerHandler.java
index 9f98355e30..f0cb509eab 100644
--- a/src/main/java/net/minecraft/server/NetServerHandler.java
+++ b/src/main/java/net/minecraft/server/NetServerHandler.java
@@ -724,6 +724,11 @@ public class NetServerHandler extends NetHandler implements ICommandListener {
 
     public boolean chat(String s) {
         if (!this.player.dead) {
+            if (s.length() == 0) {
+                a.warning(this.player.name + " tried to send an empty message");
+                return false;
+            }
+
             if (s.startsWith("/")) {
                 this.handleCommand(s);
                 return true;