diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/EntitySpawnListener.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/EntitySpawnListener.java
index d2b1270eb..a7d8133c6 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/EntitySpawnListener.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/EntitySpawnListener.java
@@ -49,12 +49,11 @@ public class EntitySpawnListener implements Listener {
     public static void testCreate(Entity entity) {
         @NotNull World world = entity.getWorld();
         if (areaName == world.getName()) {
-            if (!hasPlotArea) return;
         } else {
             areaName = world.getName();
             hasPlotArea = PlotSquared.get().hasPlotArea(areaName);
-            if (!hasPlotArea) return;
         }
+        if (!hasPlotArea) return;
         test(entity);
     }