diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/util/BlockStateListPopulator.java b/paper-server/src/main/java/org/bukkit/craftbukkit/util/BlockStateListPopulator.java
index 8f77cf482d..133d0f85e9 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/util/BlockStateListPopulator.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/util/BlockStateListPopulator.java
@@ -40,7 +40,9 @@ public class BlockStateListPopulator extends DummyGeneratorAccess {
     public boolean setTypeAndData(BlockPosition position, IBlockData data, int flag) {
         CraftBlockState state = CraftBlockState.getBlockState(world, position, flag);
         state.setData(data);
-        list.put(position, state);
+        // remove first to keep insertion order
+        list.remove(position);
+        list.put(position.immutableCopy(), state);
         return true;
     }