diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index c8da306910..3c5a120203 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -170,7 +170,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
             entity.a.e = newEntity;
             entity = newEntity;
         } else {
+            oldWorld.manager.b(entity);
             entity.a.a(location.getX(), location.getY(), location.getZ(), location.getYaw(), location.getPitch());
+            newWorld.manager.a(entity);
         }
     }