diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/rewriter/BlockItemPacketRewriter1_20_5.java b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/rewriter/BlockItemPacketRewriter1_20_5.java
index 9bc735e84..1fa5f59a8 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/rewriter/BlockItemPacketRewriter1_20_5.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/v1_20_3to1_20_5/rewriter/BlockItemPacketRewriter1_20_5.java
@@ -408,6 +408,10 @@ public final class BlockItemPacketRewriter1_20_5 extends ItemRewriter<Clientboun
             dataConverter.writeToTag(connection, structuredData, tag);
         }
 
+        if (tag.isEmpty()) {
+            dataItem.setTag(null);
+        }
+
         return dataItem;
     }