diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitMain.java b/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitMain.java
index 29925f895..a2762cd58 100644
--- a/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitMain.java
+++ b/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitMain.java
@@ -450,7 +450,7 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
                                                         if (!(passenger instanceof Player) && entity.getMetadata("keep").isEmpty()) {
                                                             iterator.remove();
                                                             entity.remove();
-                                                            entity = null;
+                                                            continue;
                                                         }
                                                     }
                                                 } else {
@@ -458,7 +458,7 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain
                                                     if (!(passenger instanceof Player) && entity.getMetadata("keep").isEmpty()) {
                                                         iterator.remove();
                                                         entity.remove();
-                                                        entity = null;
+                                                        continue;
                                                     }
                                                 }
                                             }