diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index a4ede348ff..4590a713e6 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -1032,6 +1032,10 @@ public class CraftWorld implements World {
         }
 
         if (entity != null) {
+            if (entity instanceof EntityInsentient) {
+                ((EntityInsentient) entity).a((GroupDataEntity) null); // Should be prepare?
+            }
+
             world.addEntity(entity, reason);
             return (T) entity.getBukkitEntity();
         }