diff --git a/src/main/java/net/citizensnpcs/editor/EquipmentEditor.java b/src/main/java/net/citizensnpcs/editor/EquipmentEditor.java
index 98b90a5c2..d934f0fc1 100644
--- a/src/main/java/net/citizensnpcs/editor/EquipmentEditor.java
+++ b/src/main/java/net/citizensnpcs/editor/EquipmentEditor.java
@@ -102,11 +102,13 @@ public class EquipmentEditor extends Editor {
         // Now edit the equipment based on the slot
         if (trait.getEquipment(slot) != null && trait.getEquipment(slot).getType() != Material.AIR)
             player.getWorld().dropItemNaturally(npc.getBukkitEntity().getLocation(), trait.getEquipment(slot));
-        trait.setEquipment(slot, hand);
+        ItemStack set = hand;
         if (hand.getAmount() > 1)
             hand.setAmount(hand.getAmount() - 1);
         else
             hand = null;
         player.setItemInHand(hand);
+        set.setAmount(1);
+        trait.setEquipment(slot, set);
     }
 }
\ No newline at end of file