diff --git a/paper-api/src/main/java/org/bukkit/Material.java b/paper-api/src/main/java/org/bukkit/Material.java
index 3baf2b6e6f..b316cd52fb 100644
--- a/paper-api/src/main/java/org/bukkit/Material.java
+++ b/paper-api/src/main/java/org/bukkit/Material.java
@@ -306,7 +306,7 @@ public enum Material {
      * @return MaterialData associated with this Material
      */
     public Class<? extends MaterialData> getData() {
-        return data;
+        return (data == null) ? MaterialData.class : data;
     }
 
     /**
@@ -318,7 +318,7 @@ public enum Material {
      */
     public MaterialData getNewData(final byte raw) {
         if (data == null) {
-            return null;
+            return new MaterialData(id, raw);
         }
 
         try {