diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
index 46e80e1da7..5316f7771f 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
@@ -216,7 +216,11 @@ public class CraftItemStack extends ItemStack {
 
     @Override
     public CraftItemStack clone() {
-        return new CraftItemStack(this.item == null ? this.item : this.item.cloneItemStack());
+        CraftItemStack itemStack = (CraftItemStack) super.clone();
+        if (this.item != null) {
+            itemStack.item = this.item.cloneItemStack();
+        }
+        return itemStack;
     }
 
     public static net.minecraft.server.ItemStack createNMSItemStack(ItemStack original) {