diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_16to1_15_2/Protocol1_16To1_15_2.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_16to1_15_2/Protocol1_16To1_15_2.java
index e4d1e5dc5..6fd3a7b40 100644
--- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_16to1_15_2/Protocol1_16To1_15_2.java
+++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_16to1_15_2/Protocol1_16To1_15_2.java
@@ -32,13 +32,13 @@ public class Protocol1_16To1_15_2 extends Protocol {
         TagRewriter tagRewriter = new TagRewriter(this, Protocol1_16To1_15_2::getNewBlockId, InventoryPackets::getNewItemId, metadataRewriter::getNewEntityId);
         tagRewriter.addTag(TagType.BLOCK, "minecraft:beacon_base_blocks", 133, 134, 148, 265);
         tagRewriter.addTag(TagType.BLOCK, "minecraft:climbable", 160, 241, 658);
-        // The client crashes if we don't send these tags
+        tagRewriter.addTag(TagType.BLOCK, "minecraft:fire", 142);
+        tagRewriter.addTag(TagType.ITEM, "minecraft:beacon_payment_items", 529, 530, 531, 760);
+        // The client crashes if we don't send all tags it may use
         tagRewriter.addEmptyTag(TagType.BLOCK, "minecraft:soul_speed_blocks");
         tagRewriter.addEmptyTag(TagType.BLOCK, "minecraft:soul_fire_base_blocks");
-        tagRewriter.addEmptyTag(TagType.BLOCK, "minecraft:fire");
         tagRewriter.addEmptyTag(TagType.BLOCK, "minecraft:non_flammable_wood");
         tagRewriter.addEmptyTag(TagType.ITEM, "minecraft:non_flammable_wood");
-        tagRewriter.addEmptyTag(TagType.ITEM, "minecraft:beacon_payment_items");
         tagRewriter.register(0x5C, 0x5C);
 
         // Login Success