diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
index c0854276d1..b1bde111a9 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
@@ -212,7 +212,7 @@ public class CraftItemStack extends ItemStack {
 
     @Override
     public CraftItemStack clone() {
-        return new CraftItemStack(this.item.cloneItemStack());
+        return new CraftItemStack(this.item == null ? this.item : this.item.cloneItemStack());
     }
 
     public static net.minecraft.server.ItemStack createNMSItemStack(ItemStack original) {