diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java b/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java
index da2d070efa..9b62ed436f 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java
@@ -139,7 +139,7 @@ public final class CraftChatMessage {
     }
 
     public static IChatBaseComponent fromStringOrNull(String message) {
-        return (message == null) ? null : fromString(message)[0];
+        return (message == null || message.isEmpty()) ? null : fromString(message)[0];
     }
 
     public static IChatBaseComponent[] fromString(String message) {