diff --git a/patches/server/0936-Prevent-compass-from-loading-chunks.patch b/patches/server/0936-Prevent-compass-from-loading-chunks.patch
new file mode 100644
index 000000000000..fd2163699077
--- /dev/null
+++ b/patches/server/0936-Prevent-compass-from-loading-chunks.patch
@@ -0,0 +1,19 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Shane Freeder <theboyetronic@gmail.com>
+Date: Sun, 6 Nov 2022 22:35:51 +0000
+Subject: [PATCH] Prevent compass from loading chunks
+
+
+diff --git a/src/main/java/net/minecraft/world/item/CompassItem.java b/src/main/java/net/minecraft/world/item/CompassItem.java
+index 5d3047a420efe59063e90bfc7b42392127e0ad7d..7c4a2f8bb3efd11db2f8711952cc26a067c6d56b 100644
+--- a/src/main/java/net/minecraft/world/item/CompassItem.java
++++ b/src/main/java/net/minecraft/world/item/CompassItem.java
+@@ -77,7 +77,7 @@ public class CompassItem extends Item implements Vanishable {
+                 Optional<ResourceKey<Level>> optional = getLodestoneDimension(compoundTag);
+                 if (optional.isPresent() && optional.get() == world.dimension() && compoundTag.contains("LodestonePos")) {
+                     BlockPos blockPos = NbtUtils.readBlockPos(compoundTag.getCompound("LodestonePos"));
+-                    if (!world.isInWorldBounds(blockPos) || !((ServerLevel)world).getPoiManager().existsAtPosition(PoiTypes.LODESTONE, blockPos)) {
++                    if (!world.isInWorldBounds(blockPos) || (world.hasChunkAt(blockPos) && !((ServerLevel)world).getPoiManager().existsAtPosition(PoiTypes.LODESTONE, blockPos))) { // Paper
+                         compoundTag.remove("LodestonePos");
+                     }
+                 }