diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java
index eb5df635a1..00d5f9fb25 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java
@@ -184,7 +184,7 @@ public class CraftBlockState implements BlockState {
 
     private void createData(final byte data) {
         Material mat = Material.getMaterial(type);
-        if (mat == null) {
+        if (mat == null || mat.getData() == null) {
             this.data = new MaterialData(type, data);
         } else {
             this.data = mat.getNewData(data);