diff --git a/Spigot-Server-Patches/Configurable-Cartographer-Treasure-Maps.patch b/Spigot-Server-Patches/Configurable-Cartographer-Treasure-Maps.patch
index 572424c17..61e0d15b2 100644
--- a/Spigot-Server-Patches/Configurable-Cartographer-Treasure-Maps.patch
+++ b/Spigot-Server-Patches/Configurable-Cartographer-Treasure-Maps.patch
@@ -28,7 +28,7 @@ index a80d8b2ac..32ca0a40e 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index ae68f07ab..35221decf 100644
+index ae68f07ab..8ba150a45 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -0,0 +0,0 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant {
@@ -36,6 +36,7 @@ index ae68f07ab..35221decf 100644
              int i = this.a.a(random);
              World world = imerchant.u_();
 -            BlockPosition blockposition = world.a(this.b, imerchant.v_(), true);
++            if (!world.paperConfig.enableTreasureMaps) return; //Paper
 +            BlockPosition blockposition = world.a(this.b, imerchant.v_(), world.paperConfig.treasureMapsAlreadyDiscovered); // Paper - pass false to return first structure, regardless of if its been discovered. true returns only undiscovered.
  
              if (blockposition != null) {