diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
index b1bde111a9..5e98c9d442 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
@@ -203,7 +203,11 @@ public class CraftItemStack extends ItemStack {
             list.add(subtag);
         }
 
-        tag.set("ench", list);
+        if (enchantments.isEmpty()) {
+            tag.remove("ench");
+        } else {
+            tag.set("ench", list);
+        }
     }
 
     public net.minecraft.server.ItemStack getHandle() {