diff --git a/Spigot-Server-Patches/Remove-certain-entities-that-fly-through-unloaded-ch.patch b/Spigot-Server-Patches/Remove-certain-entities-that-fly-through-unloaded-ch.patch
index 3ab0e17f81..fad5fb2982 100644
--- a/Spigot-Server-Patches/Remove-certain-entities-that-fly-through-unloaded-ch.patch
+++ b/Spigot-Server-Patches/Remove-certain-entities-that-fly-through-unloaded-ch.patch
@@ -86,7 +86,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
              entity.ticksLived++;
              entity.inactiveTick();
 +            // PaperSpigot start - Remove entities in unloaded chunks
-+            if (entity instanceof EntityEnderPearl || (!this.isChunkLoaded(i, j, true) &&
++            if (!this.isChunkLoaded(i, j, true) && ((entity instanceof EntityEnderPearl && this.paperSpigotConfig.removeUnloadedEnderPearls) ||
 +                    (entity instanceof EntityFallingBlock && this.paperSpigotConfig.removeUnloadedFallingBlocks) ||
 +                    (entity instanceof EntityTNTPrimed && this.paperSpigotConfig.removeUnloadedTNTEntities))) {
 +                entity.inUnloadedChunk = true;