diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java
index d27f24f810..95647efc78 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItemFrame.java
@@ -47,13 +47,8 @@ public class CraftItemFrame extends CraftHanging implements ItemFrame {
         this.entity = frame;
     }
 
-
     public void setItem(org.bukkit.inventory.ItemStack item) {
-        if (item == null || item.getTypeId() == 0) {
-            getHandle().setItem(null);
-        } else {
-            getHandle().setItem(CraftItemStack.asNMSCopy(item));
-        }
+        getHandle().setItem(CraftItemStack.asNMSCopy(item));
     }
 
     public org.bukkit.inventory.ItemStack getItem() {