diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/SimulatorStorage.java b/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/SimulatorStorage.java
index 05e73e94..873af36e 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/SimulatorStorage.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/SimulatorStorage.java
@@ -54,7 +54,7 @@ import java.util.stream.Collectors;
 public class SimulatorStorage implements Enable, Disable {
 
     public static final World WORLD = Bukkit.getWorlds().get(0);
-    private final File simulatorsDir = new File(Bukkit.getWorlds().get(0).getWorldFolder(), "simulators");
+    private static final File simulatorsDir = new File(Bukkit.getWorlds().get(0).getWorldFolder(), "simulators");
 
     private static NamespacedKey simulatorSelection = SWUtils.getNamespaceKey("simulator_selection");
 
@@ -99,7 +99,14 @@ public class SimulatorStorage implements Enable, Disable {
     }
 
     public static void delete(String name) {
-        tntSimulators.remove(name);
+        TNTSimulator tntSimulator = tntSimulators.remove(name);
+        if (tntSimulator != null) {
+            tntSimulator.getPlayerShowMode().forEach((player, simulatorEntityShowMode) -> {
+                SimulatorCursor.hide(player, tntSimulator);
+            });
+            tntSimulator.hide();
+        }
+        new File(simulatorsDir, name + ".simulator").delete();
     }
 
     public static void removeSimulator(ItemStack itemStack) {