diff --git a/Server/src/main/core/game/node/entity/Entity.java b/Server/src/main/core/game/node/entity/Entity.java
index d4d1a8f2b..f9746adbd 100644
--- a/Server/src/main/core/game/node/entity/Entity.java
+++ b/Server/src/main/core/game/node/entity/Entity.java
@@ -236,6 +236,12 @@ public abstract class Entity extends Node {
 	 */
 	public void clear() {
 		active = false;
+		if (this instanceof Player) {
+			location.getChunk().removePlayer(asPlayer());
+		}
+		if (this instanceof NPC) {
+			location.getChunk().remove(asNpc());
+		}
 		pulseManager.clear();
 	}