diff --git a/src/main/java/net/minestom/server/instance/block/BlockImpl.java b/src/main/java/net/minestom/server/instance/block/BlockImpl.java
index 742ad35f3..94f5d7393 100644
--- a/src/main/java/net/minestom/server/instance/block/BlockImpl.java
+++ b/src/main/java/net/minestom/server/instance/block/BlockImpl.java
@@ -274,7 +274,7 @@ class BlockImpl implements Block {
                                 state.get("pushReaction").getAsString(),
                                 state.get("blocksMotion").getAsBoolean(),
                                 state.get("isFlammable").getAsBoolean(),
-                                state.get("air").getAsBoolean(),
+                                state.get("isAir").getAsBoolean(),
                                 state.get("isLiquid").getAsBoolean(),
                                 state.get("isReplaceable").getAsBoolean(),
                                 state.get("isSolid").getAsBoolean(),
diff --git a/src/main/java/net/minestom/server/instance/block/BlockRegistry.java b/src/main/java/net/minestom/server/instance/block/BlockRegistry.java
index 947ee269c..bc8ce4226 100644
--- a/src/main/java/net/minestom/server/instance/block/BlockRegistry.java
+++ b/src/main/java/net/minestom/server/instance/block/BlockRegistry.java
@@ -25,9 +25,8 @@ class BlockRegistry {
 
     public static synchronized @Nullable Block fromStateId(short stateId) {
         Block.Supplier supplier = stateSet.get(stateId);
-        if(supplier == null){
-            System.out.println("state "+stateId);
-            return Block.STONE;
+        if (supplier == null) {
+            return null;
         }
         return supplier.get(stateId);
     }
@@ -39,8 +38,7 @@ class BlockRegistry {
     public static synchronized void register(@NotNull NamespaceID namespaceID, @NotNull Block block,
                                              @NotNull IntRange range, @NotNull Block.Supplier blockSupplier) {
         namespaceMap.put(namespaceID, block);
-        IntStream.range(range.getMinimum(), range.getMaximum()).forEach(value -> stateSet.put((short) value, blockSupplier));
+        IntStream.range(range.getMinimum(), range.getMaximum() + 1).forEach(value -> stateSet.put((short) value, blockSupplier));
         blockSet.put(block.getBlockId(), block);
-
     }
 }