diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/PistonCalculator.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/PistonCalculator.java
index 6c7640ff..bbb8ac3b 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/PistonCalculator.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/util/PistonCalculator.java
@@ -153,8 +153,17 @@ public class PistonCalculator implements Listener {
             brokenBlocks.clear();
             immovableBlocks.clear();
 
+            if (piston.isEmpty()) {
+                Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), () -> {
+                    server.close();
+                    pistOrders.remove(piston.getLocation());
+                }, 0);
+                return;
+            }
+
             Piston pistonData = (Piston) piston.getBlockData();
             if (piston.getType() == Material.PISTON && pistonData.isExtended()) {
+                visualize();
                 return;
             }