diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBlockState.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBlockState.java
index ca5820792833..42b812b0392f 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBlockState.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBlockState.java
@@ -110,8 +110,10 @@ public class CraftMetaBlockState extends CraftMetaItem implements BlockStateMeta
         } else {
             material = Material.AIR;
         }
-        blockEntityTag = getBlockState(material, internalTag);
-        internalTag = null;
+        if (internalTag != null) {
+            blockEntityTag = getBlockState(material, internalTag);
+            internalTag = null;
+        }
     }
 
     @Override