diff --git a/paper-server/patches/sources/net/minecraft/world/item/MapItem.java.patch b/paper-server/patches/sources/net/minecraft/world/item/MapItem.java.patch
new file mode 100644
index 000000000..0227d1810
--- /dev/null
+++ b/paper-server/patches/sources/net/minecraft/world/item/MapItem.java.patch
@@ -0,0 +1,13 @@
+--- a/net/minecraft/world/item/MapItem.java
++++ b/net/minecraft/world/item/MapItem.java
+@@ -97,8 +97,8 @@
+                             int r = (j / i + o - 64) * i;
+                             int s = (k / i + p - 64) * i;
+                             Multiset<MapColor> multiset = LinkedHashMultiset.create();
+-                            LevelChunk levelChunk = world.getChunk(SectionPos.blockToSectionCoord(r), SectionPos.blockToSectionCoord(s));
+-                            if (!levelChunk.isEmpty()) {
++                            LevelChunk levelChunk = world.getChunkIfLoaded(SectionPos.blockToSectionCoord(r), SectionPos.blockToSectionCoord(s)); // Paper - Maps shouldn't load chunks
++                            if (levelChunk != null && !levelChunk.isEmpty()) { // Paper - Maps shouldn't load chunks
+                                 int t = 0;
+                                 double e = 0.0;
+                                 if (world.dimensionType().hasCeiling()) {