diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_18to1_18_2/Protocol1_18To1_18_2.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_18to1_18_2/Protocol1_18To1_18_2.java
index 039685b7..ddae054b 100644
--- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_18to1_18_2/Protocol1_18To1_18_2.java
+++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_18to1_18_2/Protocol1_18To1_18_2.java
@@ -59,15 +59,20 @@ public final class Protocol1_18To1_18_2 extends BackwardsProtocol<ClientboundPac
                 });
             }
         });
+
+        registerClientbound(ClientboundPackets1_18.RESPAWN, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                handler(wrapper -> removeTagPrefix(wrapper.passthrough(Type.NBT)));
+            }
+        });
     }
 
     private void removeTagPrefix(CompoundTag tag) {
         final Tag infiniburnTag = tag.get("infiniburn");
         if (infiniburnTag instanceof StringTag) {
             final StringTag infiniburn = (StringTag) infiniburnTag;
-            if (infiniburn.getValue().startsWith("#")) {
-                infiniburn.setValue(infiniburn.getValue().substring(1));
-            }
+            infiniburn.setValue(infiniburn.getValue().substring(1));
         }
     }
 }