diff --git a/EntityTrackerFixer/src/net/minemora/entitytrackerfixer/v1_14_R1/tasks/CheckTask.java b/EntityTrackerFixer/src/net/minemora/entitytrackerfixer/v1_14_R1/tasks/CheckTask.java
index b023c13..03874d0 100644
--- a/EntityTrackerFixer/src/net/minemora/entitytrackerfixer/v1_14_R1/tasks/CheckTask.java
+++ b/EntityTrackerFixer/src/net/minemora/entitytrackerfixer/v1_14_R1/tasks/CheckTask.java
@@ -40,11 +40,9 @@ public class CheckTask extends BukkitRunnable {
 		int d = ConfigMain.getTrackingRange();
 		for(Player player : Bukkit.getWorld(worldName).getPlayers()) {
 			for(Entity ent : player.getNearbyEntities(d, d, d)) {
-				if(!cps.playerChunkMap.trackedEntities.containsKey(ent.getEntityId())) {
-					trackAgain.add(((CraftEntity)ent).getHandle());
-					if(ConfigMain.isDisableTickUntracked()) {
-						EntityTickManager.getInstance().enableTicking(((CraftEntity)ent).getHandle(), worldName);
-					}
+				trackAgain.add(((CraftEntity)ent).getHandle());
+				if(ConfigMain.isDisableTickUntracked()) {
+					EntityTickManager.getInstance().enableTicking(((CraftEntity)ent).getHandle(), worldName);
 				}
 			}
 		}
diff --git a/EntityTrackerFixer/src/net/minemora/entitytrackerfixer/v1_15_R1/tasks/CheckTask.java b/EntityTrackerFixer/src/net/minemora/entitytrackerfixer/v1_15_R1/tasks/CheckTask.java
index f4653be..73d5ff6 100644
--- a/EntityTrackerFixer/src/net/minemora/entitytrackerfixer/v1_15_R1/tasks/CheckTask.java
+++ b/EntityTrackerFixer/src/net/minemora/entitytrackerfixer/v1_15_R1/tasks/CheckTask.java
@@ -40,11 +40,9 @@ public class CheckTask extends BukkitRunnable {
 		int d = ConfigMain.getTrackingRange();
 		for(Player player : Bukkit.getWorld(worldName).getPlayers()) {
 			for(Entity ent : player.getNearbyEntities(d, d, d)) {
-				if(!cps.playerChunkMap.trackedEntities.containsKey(ent.getEntityId())) {
-					trackAgain.add(((CraftEntity)ent).getHandle());
-					if(ConfigMain.isDisableTickUntracked()) {
-						EntityTickManager.getInstance().enableTicking(((CraftEntity)ent).getHandle(), worldName);
-					}
+				trackAgain.add(((CraftEntity)ent).getHandle());
+				if(ConfigMain.isDisableTickUntracked()) {
+					EntityTickManager.getInstance().enableTicking(((CraftEntity)ent).getHandle(), worldName);
 				}
 			}
 		}