diff --git a/SpigotCore_Main/src/de/steamwar/entity/REntityServer.java b/SpigotCore_Main/src/de/steamwar/entity/REntityServer.java
index f0cf1eb..68b2a11 100644
--- a/SpigotCore_Main/src/de/steamwar/entity/REntityServer.java
+++ b/SpigotCore_Main/src/de/steamwar/entity/REntityServer.java
@@ -137,7 +137,7 @@ public class REntityServer implements Listener {
     void removeEntity(REntity entity) {
         entity.despawn(packet -> updateEntity(entity, packet));
         removeEntityFromChunk(entity);
-        entityMap.put(entity.entityId, entity);
+        entityMap.remove(entity.entityId);
     }
 
     private void addEntityToChunk(REntity entity) {