diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 6091f1a34f..48ccc0d851 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -885,8 +885,10 @@ public class CraftWorld implements World {
                 Class<?> bukkitClass = bukkitEntity.getClass();
 
                 for (Class<?> clazz : classes) {
-                    if (clazz.isAssignableFrom(bukkitClass) && bukkitEntity.isValid()) {
-                        list.add(bukkitEntity);
+                    if (clazz.isAssignableFrom(bukkitClass)) {
+                        if (bukkitEntity.isValid()) {
+                            list.add(bukkitEntity);
+                        }
                         break;
                     }
                 }