diff --git a/Spigot-Server-Patches/Tracking-Range-Improvements.patch b/Spigot-Server-Patches/Tracking-Range-Improvements.patch
index 5be0b60c9..f181870a5 100644
--- a/Spigot-Server-Patches/Tracking-Range-Improvements.patch
+++ b/Spigot-Server-Patches/Tracking-Range-Improvements.patch
@@ -28,6 +28,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
  
  import net.minecraft.server.Entity;
 +import net.minecraft.server.EntityEnderDragon; // Paper
++import net.minecraft.server.WorldServer; // Paper
  import net.minecraft.server.EntityExperienceOrb;
  import net.minecraft.server.EntityGhast;
  import net.minecraft.server.EntityItem;
@@ -69,7 +70,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
              return config.miscTrackingRange;
          } else
          {
-+            if (entity instanceof EntityEnderDragon) return defaultRange; // Paper - enderdragon is exempt
++            if (entity instanceof EntityEnderDragon) return ((WorldServer)(entity.getWorld())).getChunkProvider().playerChunkMap.getLoadViewDistance(); // Paper - enderdragon is exempt
              return config.otherTrackingRange;
          }
      }