diff --git a/common/build/libs/HMCCosmetics.jar b/common/build/libs/HMCCosmetics.jar
index 9117e4a7..c002f028 100644
Binary files a/common/build/libs/HMCCosmetics.jar and b/common/build/libs/HMCCosmetics.jar differ
diff --git a/common/build/tmp/compileJava/previous-compilation-data.bin b/common/build/tmp/compileJava/previous-compilation-data.bin
index 2f3c9e3d..08646bad 100644
Binary files a/common/build/tmp/compileJava/previous-compilation-data.bin and b/common/build/tmp/compileJava/previous-compilation-data.bin differ
diff --git a/common/src/main/java/io/github/fisher2911/hmccosmetics/hook/item/CitizensHook.java b/common/src/main/java/io/github/fisher2911/hmccosmetics/hook/item/CitizensHook.java
index 36ffed07..486234a2 100644
--- a/common/src/main/java/io/github/fisher2911/hmccosmetics/hook/item/CitizensHook.java
+++ b/common/src/main/java/io/github/fisher2911/hmccosmetics/hook/item/CitizensHook.java
@@ -144,7 +144,9 @@ public class CitizensHook implements Hook, Listener {
                                 () -> {
                                     this.npcs.put(npc.getId(), user);
                                     for (final ArmorItem.Type type : ArmorItem.Type.values()) {
-                                        this.setNpcCosmetic(npc.getId(), user.getPlayerArmor().getItem(type));
+                                        final ArmorItem armorItem = user.getPlayerArmor().getItem(type);
+                                        if (armorItem.isEmpty()) continue;
+                                        this.setNpcCosmetic(npc.getId(), armorItem);
                                     }
                                 }
                         )