diff --git a/core/src/main/java/org/geysermc/geyser/registry/Registries.java b/core/src/main/java/org/geysermc/geyser/registry/Registries.java
index 7473980cd..a81903e8e 100644
--- a/core/src/main/java/org/geysermc/geyser/registry/Registries.java
+++ b/core/src/main/java/org/geysermc/geyser/registry/Registries.java
@@ -65,7 +65,7 @@ import java.util.Set;
 /**
  * Holds all the common registries in Geyser.
  */
-public class Registries {
+public final class Registries {
     /**
      * A registry holding a CompoundTag of the known entity identifiers.
      */
diff --git a/core/src/main/java/org/geysermc/geyser/registry/VersionedRegistry.java b/core/src/main/java/org/geysermc/geyser/registry/VersionedRegistry.java
index 797c2ea48..93387a770 100644
--- a/core/src/main/java/org/geysermc/geyser/registry/VersionedRegistry.java
+++ b/core/src/main/java/org/geysermc/geyser/registry/VersionedRegistry.java
@@ -55,17 +55,21 @@ public class VersionedRegistry<V> extends AbstractMappedRegistry<Integer, V, Int
      * @return the closest value for the specified version
      */
     public V forVersion(int version) {
-        V value = null;
+        Int2ObjectMap.Entry<V> current = null;
         for (Int2ObjectMap.Entry<V> entry : this.mappings.int2ObjectEntrySet()) {
-            if (version < entry.getIntKey()) {
+            int currentVersion = entry.getIntKey();
+            if (version < currentVersion) {
                 continue;
             }
-            if (version == entry.getIntKey()) {
+            if (version == currentVersion) {
                 return entry.getValue();
             }
-            value = entry.getValue();
+            if (current == null || current.getIntKey() < currentVersion) {
+                // This version is newer and should be prioritized
+                current = entry;
+            }
         }
-        return value;
+        return current == null ? null : current.getValue();
     }
 
     /**
diff --git a/core/src/main/java/org/geysermc/geyser/registry/populator/BlockRegistryPopulator.java b/core/src/main/java/org/geysermc/geyser/registry/populator/BlockRegistryPopulator.java
index 0f2d0c941..8df6f0a7f 100644
--- a/core/src/main/java/org/geysermc/geyser/registry/populator/BlockRegistryPopulator.java
+++ b/core/src/main/java/org/geysermc/geyser/registry/populator/BlockRegistryPopulator.java
@@ -30,7 +30,6 @@ import com.google.common.collect.ImmutableMap;
 import com.nukkitx.nbt.*;
 import com.nukkitx.protocol.bedrock.v465.Bedrock_v465;
 import com.nukkitx.protocol.bedrock.v471.Bedrock_v471;
-import com.nukkitx.protocol.bedrock.v475.Bedrock_v475;
 import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
 import it.unimi.dsi.fastutil.ints.IntSet;
 import it.unimi.dsi.fastutil.objects.Object2IntMap;
@@ -39,12 +38,12 @@ import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
 import it.unimi.dsi.fastutil.objects.ObjectIntPair;
 import org.geysermc.geyser.GeyserImpl;
 import org.geysermc.geyser.level.block.BlockStateValues;
+import org.geysermc.geyser.level.physics.PistonBehavior;
 import org.geysermc.geyser.registry.BlockRegistries;
 import org.geysermc.geyser.registry.type.BlockMapping;
 import org.geysermc.geyser.registry.type.BlockMappings;
 import org.geysermc.geyser.util.BlockUtils;
 import org.geysermc.geyser.util.FileUtils;
-import org.geysermc.geyser.level.physics.PistonBehavior;
 
 import java.io.DataInputStream;
 import java.io.InputStream;
@@ -65,8 +64,7 @@ public class BlockRegistryPopulator {
     static {
         ImmutableMap.Builder<ObjectIntPair<String>, BiFunction<String, NbtMapBuilder, String>> stateMapperBuilder = ImmutableMap.<ObjectIntPair<String>, BiFunction<String, NbtMapBuilder, String>>builder()
                 .put(ObjectIntPair.of("1_17_30", Bedrock_v465.V465_CODEC.getProtocolVersion()), EMPTY_MAPPER)
-                .put(ObjectIntPair.of("1_17_40", Bedrock_v471.V471_CODEC.getProtocolVersion()), EMPTY_MAPPER)
-                .put(ObjectIntPair.of("1_18_0", Bedrock_v475.V475_CODEC.getProtocolVersion()), EMPTY_MAPPER);
+                .put(ObjectIntPair.of("1_17_40", Bedrock_v471.V471_CODEC.getProtocolVersion()), EMPTY_MAPPER);
 
         BLOCK_MAPPERS = stateMapperBuilder.build();
     }
diff --git a/core/src/main/resources/bedrock/block_palette.1_18_0.nbt b/core/src/main/resources/bedrock/block_palette.1_18_0.nbt
deleted file mode 100644
index 0415c135a..000000000
Binary files a/core/src/main/resources/bedrock/block_palette.1_18_0.nbt and /dev/null differ