diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/NMSImpl.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/NMSImpl.java
index 36e8c930b..879b39b15 100644
--- a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/NMSImpl.java
+++ b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/util/NMSImpl.java
@@ -1077,6 +1077,7 @@ public class NMSImpl implements NMSBridge {
         EntityTrackerEntry entry = server.getTracker().trackedEntities.get(entity.getEntityId());
         if (entry == null)
             return;
+        entry.a();
         PlayerlistTrackerEntry replace = new PlayerlistTrackerEntry(entry);
         server.getTracker().trackedEntities.a(entity.getEntityId(), replace);
         if (TRACKED_ENTITY_SET != null) {
diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/NMSImpl.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/NMSImpl.java
index 4785bfb15..0f0020a98 100644
--- a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/NMSImpl.java
+++ b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/util/NMSImpl.java
@@ -1130,6 +1130,7 @@ public class NMSImpl implements NMSBridge {
         EntityTrackerEntry entry = server.getTracker().trackedEntities.get(entity.getEntityId());
         if (entry == null)
             return;
+        entry.a();
         PlayerlistTrackerEntry replace = new PlayerlistTrackerEntry(entry);
         server.getTracker().trackedEntities.a(entity.getEntityId(), replace);
         if (TRACKED_ENTITY_SET != null) {
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/NMSImpl.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/NMSImpl.java
index 7ce5fe1a4..2253995e3 100644
--- a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/NMSImpl.java
+++ b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/util/NMSImpl.java
@@ -1137,6 +1137,7 @@ public class NMSImpl implements NMSBridge {
         EntityTrackerEntry entry = server.getTracker().trackedEntities.get(entity.getEntityId());
         if (entry == null)
             return;
+        entry.a();
         PlayerlistTrackerEntry replace = new PlayerlistTrackerEntry(entry);
         server.getTracker().trackedEntities.a(entity.getEntityId(), replace);
         if (TRACKED_ENTITY_SET != null) {
diff --git a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/NMSImpl.java b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/NMSImpl.java
index a3872f47b..b9f2b5d00 100644
--- a/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/NMSImpl.java
+++ b/v1_13_R2/src/main/java/net/citizensnpcs/nms/v1_13_R2/util/NMSImpl.java
@@ -1179,6 +1179,7 @@ public class NMSImpl implements NMSBridge {
         EntityTrackerEntry entry = server.getTracker().trackedEntities.get(entity.getEntityId());
         if (entry == null)
             return;
+        entry.a();
         PlayerlistTrackerEntry replace = new PlayerlistTrackerEntry(entry);
         server.getTracker().trackedEntities.a(entity.getEntityId(), replace);
         if (TRACKED_ENTITY_SET != null) {
diff --git a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/NMSImpl.java b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/NMSImpl.java
index 6af858911..e95d9820b 100644
--- a/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/NMSImpl.java
+++ b/v1_14_R1/src/main/java/net/citizensnpcs/nms/v1_14_R1/util/NMSImpl.java
@@ -1206,6 +1206,7 @@ public class NMSImpl implements NMSBridge {
         EntityTracker entry = server.getChunkProvider().playerChunkMap.trackedEntities.get(entity.getEntityId());
         if (entry == null)
             return;
+        entry.a();
         PlayerlistTracker replace = new PlayerlistTracker(server.getChunkProvider().playerChunkMap, entry);
         server.getChunkProvider().playerChunkMap.trackedEntities.put(entity.getEntityId(), replace);
         if (getHandle(entity) instanceof EntityHumanNPC) {
diff --git a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/NMSImpl.java b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/NMSImpl.java
index f95a7928b..0de933e7c 100644
--- a/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/NMSImpl.java
+++ b/v1_15_R1/src/main/java/net/citizensnpcs/nms/v1_15_R1/util/NMSImpl.java
@@ -1223,6 +1223,7 @@ public class NMSImpl implements NMSBridge {
         EntityTracker entry = server.getChunkProvider().playerChunkMap.trackedEntities.get(entity.getEntityId());
         if (entry == null)
             return;
+        entry.a();
         PlayerlistTracker replace = new PlayerlistTracker(server.getChunkProvider().playerChunkMap, entry);
         server.getChunkProvider().playerChunkMap.trackedEntities.put(entity.getEntityId(), replace);
         if (getHandle(entity) instanceof EntityHumanNPC) {
diff --git a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/NMSImpl.java b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/NMSImpl.java
index 5cbd8b8e4..2179db0fb 100644
--- a/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/NMSImpl.java
+++ b/v1_16_R3/src/main/java/net/citizensnpcs/nms/v1_16_R3/util/NMSImpl.java
@@ -1260,6 +1260,7 @@ public class NMSImpl implements NMSBridge {
         EntityTracker entry = server.getChunkProvider().playerChunkMap.trackedEntities.get(entity.getEntityId());
         if (entry == null)
             return;
+        entry.a();
         PlayerlistTracker replace = new PlayerlistTracker(server.getChunkProvider().playerChunkMap, entry);
         server.getChunkProvider().playerChunkMap.trackedEntities.put(entity.getEntityId(), replace);
         if (getHandle(entity) instanceof EntityHumanNPC) {
diff --git a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/NMSImpl.java b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/NMSImpl.java
index e828804b9..9aade1e53 100644
--- a/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/NMSImpl.java
+++ b/v1_17_R1/src/main/java/net/citizensnpcs/nms/v1_17_R1/util/NMSImpl.java
@@ -1242,6 +1242,7 @@ public class NMSImpl implements NMSBridge {
         TrackedEntity entry = server.getChunkProvider().chunkMap.G.get(entity.getEntityId());
         if (entry == null)
             return;
+        entry.broadcastRemoved();
         PlayerlistTracker replace = new PlayerlistTracker(server.getChunkProvider().chunkMap, entry);
         server.getChunkProvider().chunkMap.G.put(entity.getEntityId(), replace);
         if (getHandle(entity) instanceof EntityHumanNPC) {
diff --git a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/NMSImpl.java b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/NMSImpl.java
index f7af3bebb..24cff7822 100644
--- a/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/NMSImpl.java
+++ b/v1_18_R2/src/main/java/net/citizensnpcs/nms/v1_18_R2/util/NMSImpl.java
@@ -1250,6 +1250,7 @@ public class NMSImpl implements NMSBridge {
         TrackedEntity entry = server.getChunkSource().chunkMap.entityMap.get(entity.getEntityId());
         if (entry == null)
             return;
+        entry.broadcastRemoved();
         PlayerlistTracker replace = new PlayerlistTracker(server.getChunkSource().chunkMap, entry);
         server.getChunkSource().chunkMap.entityMap.put(entity.getEntityId(), replace);
         if (getHandle(entity) instanceof EntityHumanNPC) {
diff --git a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/NMSImpl.java b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/NMSImpl.java
index dc456c947..e1f3ea64d 100644
--- a/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/NMSImpl.java
+++ b/v1_19_R3/src/main/java/net/citizensnpcs/nms/v1_19_R3/util/NMSImpl.java
@@ -1349,6 +1349,7 @@ public class NMSImpl implements NMSBridge {
         TrackedEntity entry = server.getChunkSource().chunkMap.entityMap.get(entity.getEntityId());
         if (entry == null)
             return;
+        entry.broadcastRemoved();
         CitizensEntityTracker replace = new CitizensEntityTracker(server.getChunkSource().chunkMap, entry);
         server.getChunkSource().chunkMap.entityMap.put(entity.getEntityId(), replace);
     }
diff --git a/v1_20_R1/src/main/java/net/citizensnpcs/nms/v1_20_R1/util/NMSImpl.java b/v1_20_R1/src/main/java/net/citizensnpcs/nms/v1_20_R1/util/NMSImpl.java
index c047ed21f..5ca5a3ed0 100644
--- a/v1_20_R1/src/main/java/net/citizensnpcs/nms/v1_20_R1/util/NMSImpl.java
+++ b/v1_20_R1/src/main/java/net/citizensnpcs/nms/v1_20_R1/util/NMSImpl.java
@@ -1348,6 +1348,7 @@ public class NMSImpl implements NMSBridge {
         TrackedEntity entry = server.getChunkSource().chunkMap.entityMap.get(entity.getEntityId());
         if (entry == null)
             return;
+        entry.broadcastRemoved();
         CitizensEntityTracker replace = new CitizensEntityTracker(server.getChunkSource().chunkMap, entry);
         server.getChunkSource().chunkMap.entityMap.put(entity.getEntityId(), replace);
     }
diff --git a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/NMSImpl.java b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/NMSImpl.java
index 0bc868545..479a6c07e 100644
--- a/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/NMSImpl.java
+++ b/v1_8_R3/src/main/java/net/citizensnpcs/nms/v1_8_R3/util/NMSImpl.java
@@ -998,6 +998,7 @@ public class NMSImpl implements NMSBridge {
         EntityTrackerEntry entry = server.getTracker().trackedEntities.get(entity.getEntityId());
         if (entry == null)
             return;
+        entry.a();
         PlayerlistTrackerEntry replace = new PlayerlistTrackerEntry(entry);
         server.getTracker().trackedEntities.a(entity.getEntityId(), replace);
         if (TRACKED_ENTITY_SET != null) {