diff --git a/connector/src/main/java/org/geysermc/connector/registry/populator/BlockRegistryPopulator.java b/connector/src/main/java/org/geysermc/connector/registry/populator/BlockRegistryPopulator.java
index 53ed89b3a..c2ce93d16 100644
--- a/connector/src/main/java/org/geysermc/connector/registry/populator/BlockRegistryPopulator.java
+++ b/connector/src/main/java/org/geysermc/connector/registry/populator/BlockRegistryPopulator.java
@@ -270,12 +270,6 @@ public class BlockRegistryPopulator {
                 builder.pickItem(pickItemNode.textValue());
             }
 
-            builder.javaIdentifier(javaId);
-            builder.javaBlockId(uniqueJavaId);
-
-            BlockRegistries.JAVA_IDENTIFIERS.register(javaId, javaRuntimeId);
-            BlockRegistries.JAVA_BLOCKS.register(javaRuntimeId, builder.build());
-
             BlockStateValues.storeBlockStateValues(entry.getKey(), javaRuntimeId, entry.getValue());
 
             String cleanJavaIdentifier = entry.getKey().split("\\[")[0];
@@ -286,6 +280,12 @@ public class BlockRegistryPopulator {
                 BlockRegistries.JAVA_CLEAN_IDENTIFIERS.register(uniqueJavaId, cleanJavaIdentifier);
             }
 
+            builder.javaIdentifier(javaId);
+            builder.javaBlockId(uniqueJavaId);
+
+            BlockRegistries.JAVA_IDENTIFIERS.register(javaId, javaRuntimeId);
+            BlockRegistries.JAVA_BLOCKS.register(javaRuntimeId, builder.build());
+
             // Keeping this here since this is currently unchanged between versions
             if (!cleanJavaIdentifier.equals(bedrockIdentifier)) {
                 BlockRegistries.JAVA_TO_BEDROCK_IDENTIFIERS.register(cleanJavaIdentifier, bedrockIdentifier);