diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/PlayerEvents.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/PlayerEvents.java
index 0593d9cd8..28c77f999 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/PlayerEvents.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/listeners/PlayerEvents.java
@@ -498,23 +498,11 @@ public class PlayerEvents extends com.intellectualcrafters.plot.listeners.PlotLi
         final List<BlockState> blocks = e.getBlocks();
         boolean remove = false;
         for (int i = blocks.size() - 1; i >= 0; i--) {
-            if (remove) {
+            final Location loc = BukkitUtil.getLocation(blocks.get(i).getLocation());
+            Plot plot = getCurrentPlot(loc);
+            if (plot == null || !plot.hasOwner()) {
                 e.getBlocks().remove(i);
-                remove = true;
-                if (!isInPlot(loc)) {
-                    if (isPlotArea(loc)) {
-                        e.getBlocks().remove(i);
-                    }
-                }
             }
-            else {
-                final Location loc = BukkitUtil.getLocation(blocks.get(i).getLocation());
-                if (!isPlotArea(loc)) {
-                    remove = true;
-                    e.getBlocks().remove(i);
-                }
-            }
-            
         }
     }