diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index 8676a5ff1e..7a7fd39134 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -362,6 +362,11 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
             name = "";
         }
 
+        // Names cannot be more than 64 characters due to DataWatcher limitations
+        if (name.length() > 64) {
+            name = name.substring(0, 64);
+        }
+
         getHandle().setCustomName(name);
     }