diff --git a/src/main/java/net/minecraft/entity/EntityTracker.java b/src/main/java/net/minecraft/entity/EntityTracker.java
index ed8201b..a8107c5 100644
--- a/src/main/java/net/minecraft/entity/EntityTracker.java
+++ b/src/main/java/net/minecraft/entity/EntityTracker.java
@@ -263,6 +263,8 @@
 
 	public void updateTrackedEntities()
 	{
+		if(theWorld.playerEntities.size() == 0)
+			return;
 		ArrayList arraylist = new ArrayList();
 		Iterator iterator = this.trackedEntities.iterator();
 
diff --git a/src/main/java/net/minecraft/entity/EntityTrackerEntry.java b/src/main/java/net/minecraft/entity/EntityTrackerEntry.java
index 4dc72ae..f638856 100644
--- a/src/main/java/net/minecraft/entity/EntityTrackerEntry.java
+++ b/src/main/java/net/minecraft/entity/EntityTrackerEntry.java
@@ -158,6 +158,10 @@
 
 			this.sendMetadataToAllAssociatedPlayers();
 		}
+		else if(trackingPlayers.size() == 0)
+		{
+			// No players - no tracking
+		}
 		else if (this.ticks % this.updateFrequency == 0 || this.myEntity.isAirBorne || this.myEntity.getDataWatcher().hasChanges())
 		{
 			int i;