diff --git a/src/main/java/com/sk89q/worldguard/bukkit/listener/RegionProtectionListener.java b/src/main/java/com/sk89q/worldguard/bukkit/listener/RegionProtectionListener.java
index 4989a109..bdcd5da5 100644
--- a/src/main/java/com/sk89q/worldguard/bukkit/listener/RegionProtectionListener.java
+++ b/src/main/java/com/sk89q/worldguard/bukkit/listener/RegionProtectionListener.java
@@ -468,7 +468,7 @@ public void onVehicleExit(VehicleExitEvent event) {
     }
 
     private boolean isWhitelistedEntity(Entity entity) {
-        return Entities.isHostile(entity) || Entities.isAmbient(entity);
+        return Entities.isNonPlayerCreature(entity);
     }
 
 }