diff --git a/src/main/java/net/minecraft/server/EntityTracker.java b/src/main/java/net/minecraft/server/EntityTracker.java
index 05b4b2a306..4a7541dccd 100644
--- a/src/main/java/net/minecraft/server/EntityTracker.java
+++ b/src/main/java/net/minecraft/server/EntityTracker.java
@@ -69,7 +69,8 @@ public class EntityTracker {
         }
 
         if (this.b.b(entity.id)) {
-            throw new IllegalStateException("Entity is already tracked!");
+            // CraftBukkit - removed exception throw as tracking an already tracked entity theoretically shouldn't cause any issues.
+            //throw new IllegalStateException("Entity is already tracked!");
         } else {
             EntityTrackerEntry entitytrackerentry = new EntityTrackerEntry(entity, i, j, flag);