diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/v1_21to1_21_2/rewriter/BlockItemPacketRewriter1_21_2.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_21to1_21_2/rewriter/BlockItemPacketRewriter1_21_2.java
index 02a75c90c..7d053a49c 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/v1_21to1_21_2/rewriter/BlockItemPacketRewriter1_21_2.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_21to1_21_2/rewriter/BlockItemPacketRewriter1_21_2.java
@@ -563,11 +563,17 @@ public final class BlockItemPacketRewriter1_21_2 extends StructuredItemRewriter<
         dataContainer.replaceKey(StructuredDataKey.BUNDLE_CONTENTS1_21, StructuredDataKey.BUNDLE_CONTENTS1_21_2);
         dataContainer.replaceKey(StructuredDataKey.POTION_CONTENTS1_20_5, StructuredDataKey.POTION_CONTENTS1_21_2);
         dataContainer.replace(StructuredDataKey.FIRE_RESISTANT, StructuredDataKey.DAMAGE_RESISTANT, fireResistant -> new DamageResistant("minecraft:is_fire"));
-        dataContainer.replace(StructuredDataKey.LOCK, lock -> {
+        dataContainer.replace(StructuredDataKey.LOCK, tag -> {
+            final String lock = ((StringTag) tag).getValue();
+            if (lock.isEmpty()) {
+                // Previously ignored empty values since the data was arbitrary, custom_name doesn't accept empty values
+                return null;
+            }
+
             final CompoundTag predicateTag = new CompoundTag();
             final CompoundTag itemComponentsTag = new CompoundTag();
             predicateTag.put("components", itemComponentsTag);
-            itemComponentsTag.put("custom_name", lock);
+            itemComponentsTag.put("custom_name", tag);
             return predicateTag;
         });
     }