diff --git a/EntityTrackerFixer/src/net/minemora/entitytrackerfixer/v1_14_R1/entityTick/EntityTickManager.java b/EntityTrackerFixer/src/net/minemora/entitytrackerfixer/v1_14_R1/entityTick/EntityTickManager.java
index f5a6a36..674deb3 100644
--- a/EntityTrackerFixer/src/net/minemora/entitytrackerfixer/v1_14_R1/entityTick/EntityTickManager.java
+++ b/EntityTrackerFixer/src/net/minemora/entitytrackerfixer/v1_14_R1/entityTick/EntityTickManager.java
@@ -73,6 +73,9 @@ public class EntityTickManager extends BukkitRunnable {
 					if(!entity.valid) {
 						continue;
 					}
+					if(ws.entitiesById.containsValue(entity)) {
+						continue;
+					}
 					if(ws.entitiesById.containsKey(i)) {
 						int id = ((AtomicInteger)entityCount.get(null)).incrementAndGet();
 						ws.entitiesById.put(id, entity);
diff --git a/EntityTrackerFixer/src/net/minemora/entitytrackerfixer/v1_15_R1/entityTick/EntityTickManager.java b/EntityTrackerFixer/src/net/minemora/entitytrackerfixer/v1_15_R1/entityTick/EntityTickManager.java
index 50f31a6..8437984 100644
--- a/EntityTrackerFixer/src/net/minemora/entitytrackerfixer/v1_15_R1/entityTick/EntityTickManager.java
+++ b/EntityTrackerFixer/src/net/minemora/entitytrackerfixer/v1_15_R1/entityTick/EntityTickManager.java
@@ -73,6 +73,9 @@ public class EntityTickManager extends BukkitRunnable {
 					if(!entity.valid) {
 						continue;
 					}
+					if(ws.entitiesById.containsValue(entity)) {
+						continue;
+					}
 					if(ws.entitiesById.containsKey(i)) {
 						int id = ((AtomicInteger)entityCount.get(null)).incrementAndGet();
 						ws.entitiesById.put(id, entity);