diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
index 04ae4ec8b7..704be690c8 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
@@ -360,7 +360,7 @@ public final class CraftItemStack extends ItemStack {
         if (item == null) {
             return false;
         }
-        if (itemMeta == null) {
+        if (CraftItemFactory.instance().equals(itemMeta, null)) {
             item.tag = null;
             return true;
         }