diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 9db77a9c04..f786464ab6 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -91,7 +91,7 @@ public abstract class Entity {
     public boolean al;
     public EnumEntitySize am;
     public UUID uniqueId = UUID.randomUUID(); // CraftBukkit
-    public boolean valid = true; // CraftBukkit
+    public boolean valid = false; // CraftBukkit
 
     public Entity(World world) {
         this.id = entityCount++;
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index b3bdccc372..e3f8ed0acd 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -878,6 +878,8 @@ public abstract class World implements IBlockAccess {
 
             iworldaccess.a(entity);
         }
+
+        entity.valid = true; // CraftBukkit
     }
 
     protected void b(Entity entity) {