diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/BlockItemPackets1_13.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/BlockItemPackets1_13.java
index 8fd4db9e..54545b76 100644
--- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/BlockItemPackets1_13.java
+++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/BlockItemPackets1_13.java
@@ -823,10 +823,16 @@ public class BlockItemPackets1_13 extends nl.matsv.viabackwards.api.rewriters.It
             }
         }
 
+        // Handle custom mappings
+        int identifier = item.getIdentifier();
+        item.setIdentifier(rawId);
         super.handleItemToServer(item);
         // Mapped with original data, we can return here
         if (item.getIdentifier() != rawId) return item;
 
+        // Set to legacy id again
+        item.setIdentifier(identifier);
+
         int newId = -1;
         if (!MappingData.oldToNewItems.containsKey(rawId)) {
             if (!isDamageable(item.getIdentifier()) && item.getIdentifier() != 358) { // Map