diff --git a/gale-server/src/main/java/org/galemc/gale/registry/blockstate/BlockStateIdMapper.java b/gale-server/src/main/java/org/galemc/gale/registry/blockstate/BlockStateIdMapper.java
index 374202e0..28b23075 100644
--- a/gale-server/src/main/java/org/galemc/gale/registry/blockstate/BlockStateIdMapper.java
+++ b/gale-server/src/main/java/org/galemc/gale/registry/blockstate/BlockStateIdMapper.java
@@ -38,7 +38,7 @@ public int getId(final BlockState thing) {
 
     @Override
     public final @Nullable BlockState byId(final int id) {
-        return this.idToT.get(id);
+        return id >= 0 && id < this.idToT.size() ? this.idToT.get(id) : null;
     }
 
     @Override