diff --git a/common/src/main/java/com/viaversion/viaversion/rewriter/ItemRewriter.java b/common/src/main/java/com/viaversion/viaversion/rewriter/ItemRewriter.java
index f157222de..ce46ed36c 100644
--- a/common/src/main/java/com/viaversion/viaversion/rewriter/ItemRewriter.java
+++ b/common/src/main/java/com/viaversion/viaversion/rewriter/ItemRewriter.java
@@ -291,9 +291,13 @@ public abstract class ItemRewriter<C extends ClientboundPacketType, S extends Se
             public void register() {
                 map(Type.UNSIGNED_BYTE); // Container id
                 handler(wrapper -> {
+                    Mappings mappings = protocol.getMappingData().getEnchantmentMappings();
+                    if (mappings == null) {
+                        return;
+                    }
+
                     short property = wrapper.passthrough(Type.SHORT);
                     if (property >= 4 && property <= 6) { // Enchantment id
-                        Mappings mappings = protocol.getMappingData().getEnchantmentMappings();
                         short enchantmentId = (short) mappings.getNewId(wrapper.read(Type.SHORT));
                         wrapper.write(Type.SHORT, enchantmentId);
                     }
diff --git a/common/src/main/resources/assets/viaversion/data/heightmap-1.14.nbt b/common/src/main/resources/assets/viaversion/data/heightmap-1.14.nbt
index 0d6b129ce..5ab4caef0 100644
Binary files a/common/src/main/resources/assets/viaversion/data/heightmap-1.14.nbt and b/common/src/main/resources/assets/viaversion/data/heightmap-1.14.nbt differ