diff --git a/Spigot-Server-Patches/Remove-specific-entities-that-fly-through-an-unloade.patch b/Spigot-Server-Patches/Remove-specific-entities-that-fly-through-an-unloade.patch
index 7e1eba292a..56b083e793 100644
--- a/Spigot-Server-Patches/Remove-specific-entities-that-fly-through-an-unloade.patch
+++ b/Spigot-Server-Patches/Remove-specific-entities-that-fly-through-an-unloade.patch
@@ -83,7 +83,9 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
              entity.ticksLived++;
              entity.inactiveTick();
 +            // PaperSpigot start - Remove entities in unloaded chunks
-+            if (entity instanceof EntityEnderPearl) {
++            if (entity instanceof EntityEnderPearl || (!this.isChunkLoaded(i, j) &&
++                    (entity instanceof EntityFallingBlock && this.paperSpigotConfig.removeUnloadedFallingBlocks) ||
++                    (entity instanceof EntityTNTPrimed && this.paperSpigotConfig.removeUnloadedTNTEntities))) {
 +                entity.inUnloadedChunk = true;
 +                entity.die();
 +            }