diff --git a/FightSystem_Main/src/de/steamwar/fightsystem/fight/FightWorld.java b/FightSystem_Main/src/de/steamwar/fightsystem/fight/FightWorld.java
index 47bfe68..7c2d4d3 100644
--- a/FightSystem_Main/src/de/steamwar/fightsystem/fight/FightWorld.java
+++ b/FightSystem_Main/src/de/steamwar/fightsystem/fight/FightWorld.java
@@ -27,6 +27,8 @@ import de.steamwar.fightsystem.states.StateDependent;
 import org.bukkit.Bukkit;
 import org.bukkit.World;
 import org.bukkit.WorldCreator;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.EntityType;
 
 public class FightWorld extends StateDependent {
 
@@ -62,6 +64,12 @@ public class FightWorld extends StateDependent {
 
     @Override
     public void disable() {
+        for(Entity entity : world.getEntities()){
+            if(entity.getType() != EntityType.PLAYER){
+                entity.remove();
+            }
+        }
+
         World backup = new WorldCreator(world.getName() + "/backup").createWorld();
         assert backup != null;
         Config.ArenaRegion.forEachChunk((x, z) -> resetChunk(backup, x, z));