diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
index 8ed4b4bd3a..f12b67be43 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
@@ -147,10 +147,10 @@ public final class CraftItemStack extends ItemStack {
         if (handle == null) {
             return;
         }
+
+        handle.setCount(amount);
         if (amount == 0) {
             handle = null;
-        } else {
-            handle.setCount(amount);
         }
     }