diff --git a/connector/src/main/java/org/geysermc/connector/entity/living/animal/horse/LlamaEntity.java b/connector/src/main/java/org/geysermc/connector/entity/living/animal/horse/LlamaEntity.java
index c6657602d..e20132c5e 100644
--- a/connector/src/main/java/org/geysermc/connector/entity/living/animal/horse/LlamaEntity.java
+++ b/connector/src/main/java/org/geysermc/connector/entity/living/animal/horse/LlamaEntity.java
@@ -26,7 +26,6 @@
 package org.geysermc.connector.entity.living.animal.horse;
 
 import com.github.steveice10.mc.protocol.data.game.entity.metadata.EntityMetadata;
-import com.github.steveice10.mc.protocol.data.game.world.block.BlockState;
 import com.nukkitx.math.vector.Vector3f;
 import com.nukkitx.protocol.bedrock.data.EntityData;
 import com.nukkitx.protocol.bedrock.data.ItemData;
@@ -57,12 +56,14 @@ public class LlamaEntity extends ChestedHorseEntity {
                 // The damage value is the dye color that Java sends us
                 // Always going to be a carpet so we can hardcode 171
                 // The int then short conversion is required or we get a ClassCastException
-                equipmentPacket.setChestplate(ItemData.of(171, (short)((int) entityMetadata.getValue()), 1));
-            } else equipmentPacket.setChestplate(ItemData.of(0, (short) 0, 0));
+                equipmentPacket.setChestplate(ItemData.of(BlockTranslator.LLAMA_ARMOR_ID, (short)((int) entityMetadata.getValue()), 1));
+            } else {
+                equipmentPacket.setChestplate(ItemData.AIR);
+            }
             // Required to fill out the rest of the equipment or Bedrock ignores it
-            equipmentPacket.setBoots(ItemData.of(0, (short) 0, 0));
-            equipmentPacket.setHelmet(ItemData.of(0, (short) 0, 0));
-            equipmentPacket.setLeggings(ItemData.of(0, (short) 0, 0));
+            equipmentPacket.setBoots(ItemData.AIR);
+            equipmentPacket.setHelmet(ItemData.AIR);
+            equipmentPacket.setLeggings(ItemData.AIR);
 
             session.getUpstream().sendPacket(equipmentPacket);
         }
diff --git a/connector/src/main/java/org/geysermc/connector/network/translators/block/BlockTranslator.java b/connector/src/main/java/org/geysermc/connector/network/translators/block/BlockTranslator.java
index 98846e882..66d476702 100644
--- a/connector/src/main/java/org/geysermc/connector/network/translators/block/BlockTranslator.java
+++ b/connector/src/main/java/org/geysermc/connector/network/translators/block/BlockTranslator.java
@@ -55,6 +55,9 @@ public class BlockTranslator {
     private static final Int2ObjectMap<BlockState> BEDROCK_TO_JAVA_BLOCK_MAP = new Int2ObjectOpenHashMap<>();
     private static final IntSet WATERLOGGED = new IntOpenHashSet();
 
+    // Carpet ID, used in LlamaEntity.java
+    public static final int LLAMA_ARMOR_ID = 171;
+
     private static final int BLOCK_STATE_VERSION = 17760256;
 
     static {