diff --git a/paper-server/patches/sources/net/minecraft/server/level/ServerLevel.java.patch b/paper-server/patches/sources/net/minecraft/server/level/ServerLevel.java.patch
index 87a5b2cab0..d9915e3d7d 100644
--- a/paper-server/patches/sources/net/minecraft/server/level/ServerLevel.java.patch
+++ b/paper-server/patches/sources/net/minecraft/server/level/ServerLevel.java.patch
@@ -1238,7 +1238,7 @@
 +            // CraftBukkit start
 +            entity.valid = false;
 +            if (!(entity instanceof ServerPlayer)) {
-+                for (ServerPlayer player : ServerLevel.this.players) {
++                for (ServerPlayer player : ServerLevel.this.server.getPlayerList().players) { // Paper - call onEntityRemove for all online players
 +                    player.getBukkitEntity().onEntityRemove(entity);
 +                }
 +            }