diff --git a/fabric-1.16.1/src/main/java/org/dynmap/fabric_1_16_1/ChunkSnapshot.java b/fabric-1.16.1/src/main/java/org/dynmap/fabric_1_16_1/ChunkSnapshot.java
index 42d6b07a..ebdd394b 100644
--- a/fabric-1.16.1/src/main/java/org/dynmap/fabric_1_16_1/ChunkSnapshot.java
+++ b/fabric-1.16.1/src/main/java/org/dynmap/fabric_1_16_1/ChunkSnapshot.java
@@ -3,6 +3,8 @@ package org.dynmap.fabric_1_16_1;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.ListTag;
 import net.minecraft.util.collection.PackedIntegerArray;
+import net.minecraft.util.math.MathHelper;
+import net.minecraft.util.math.WordPackedArray;
 import org.dynmap.Log;
 import org.dynmap.renderer.DynmapBlockState;
 
@@ -128,10 +130,10 @@ public class ChunkSnapshot {
     public static class StateListException extends Exception {
         private static boolean loggedOnce = false;
 
-        public StateListException(int x, int z, int expectedLength, int actualLength) {
+        public StateListException(int x, int z, int actualLength, int expectedLength, int expectedLegacyLength) {
             if (Log.verbose || !loggedOnce) {
                 loggedOnce = true;
-                Log.info("Skipping chunk at x=" + x + ",z=" + z + ". Expected statelist of length " + expectedLength + " but got " + actualLength + ". This can happen if the chunk was not yet converted to the 1.16 format which can be fixed by visiting the chunk.");
+                Log.info("Skipping chunk at x=" + x + ",z=" + z + ". Expected statelist of length " + expectedLength + " or " + expectedLegacyLength + " but got " + actualLength + ". This can happen if the chunk was not yet converted to the 1.16 format which can be fixed by visiting the chunk.");
                 if (!Log.verbose) {
                     Log.info("You will only see this message once. Turn on verbose logging in the configuration to see all messages.");
                 }
@@ -198,20 +200,30 @@ public class ChunkSnapshot {
                     }
                 }
 
+                PackedIntegerArray db = null;
+                WordPackedArray dbp = null;
+
                 int bitsperblock = (statelist.length * 64) / 4096;
                 int expectedStatelistLength = (4096 + (64 / bitsperblock) - 1) / (64 / bitsperblock);
-                if (expectedStatelistLength != statelist.length) {
-                    throw new StateListException(x, z, expectedStatelistLength, statelist.length);
+                if (statelist.length == expectedStatelistLength) {
+                    db = new PackedIntegerArray(bitsperblock, 4096, statelist);
+                } else {
+                    int expectedLegacyStatelistLength = MathHelper.roundUpToMultiple(bitsperblock * 4096, 64) / 64;
+                    if (statelist.length == expectedLegacyStatelistLength) {
+                        dbp = new WordPackedArray(bitsperblock, 4096, statelist);
+                    } else {
+                        throw new StateListException(x, z, statelist.length, expectedStatelistLength, expectedLegacyStatelistLength);
+                    }
                 }
 
-                PackedIntegerArray db = new PackedIntegerArray(bitsperblock, 4096, statelist);
                 if (bitsperblock > 8) {    // Not palette
                     for (int j = 0; j < 4096; j++) {
-                        states[j] = DynmapBlockState.getStateByGlobalIndex(db.get(j));
+                        int v = db != null ? db.get(j) : dbp.get(j);
+                        states[j] = DynmapBlockState.getStateByGlobalIndex(v);
                     }
                 } else {
                     for (int j = 0; j < 4096; j++) {
-                        int v = db.get(j);
+                        int v = db != null ? db.get(j) : dbp.get(j);
                         states[j] = (v < palette.length) ? palette[v] : DynmapBlockState.AIR;
                     }
                 }
diff --git a/fabric-1.16.2/src/main/java/org/dynmap/fabric_1_16_2/ChunkSnapshot.java b/fabric-1.16.2/src/main/java/org/dynmap/fabric_1_16_2/ChunkSnapshot.java
index 38d4461f..89a436c3 100644
--- a/fabric-1.16.2/src/main/java/org/dynmap/fabric_1_16_2/ChunkSnapshot.java
+++ b/fabric-1.16.2/src/main/java/org/dynmap/fabric_1_16_2/ChunkSnapshot.java
@@ -3,6 +3,8 @@ package org.dynmap.fabric_1_16_2;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.ListTag;
 import net.minecraft.util.collection.PackedIntegerArray;
+import net.minecraft.util.math.MathHelper;
+import net.minecraft.util.math.WordPackedArray;
 import org.dynmap.Log;
 import org.dynmap.renderer.DynmapBlockState;
 
@@ -128,10 +130,10 @@ public class ChunkSnapshot {
     public static class StateListException extends Exception {
         private static boolean loggedOnce = false;
 
-        public StateListException(int x, int z, int expectedLength, int actualLength) {
+        public StateListException(int x, int z, int actualLength, int expectedLength, int expectedLegacyLength) {
             if (Log.verbose || !loggedOnce) {
                 loggedOnce = true;
-                Log.info("Skipping chunk at x=" + x + ",z=" + z + ". Expected statelist of length " + expectedLength + " but got " + actualLength + ". This can happen if the chunk was not yet converted to the 1.16 format which can be fixed by visiting the chunk.");
+                Log.info("Skipping chunk at x=" + x + ",z=" + z + ". Expected statelist of length " + expectedLength + " or " + expectedLegacyLength + " but got " + actualLength + ". This can happen if the chunk was not yet converted to the 1.16 format which can be fixed by visiting the chunk.");
                 if (!Log.verbose) {
                     Log.info("You will only see this message once. Turn on verbose logging in the configuration to see all messages.");
                 }
@@ -198,20 +200,30 @@ public class ChunkSnapshot {
                     }
                 }
 
+                PackedIntegerArray db = null;
+                WordPackedArray dbp = null;
+
                 int bitsperblock = (statelist.length * 64) / 4096;
                 int expectedStatelistLength = (4096 + (64 / bitsperblock) - 1) / (64 / bitsperblock);
-                if (expectedStatelistLength != statelist.length) {
-                    throw new StateListException(x, z, expectedStatelistLength, statelist.length);
+                if (statelist.length == expectedStatelistLength) {
+                    db = new PackedIntegerArray(bitsperblock, 4096, statelist);
+                } else {
+                    int expectedLegacyStatelistLength = MathHelper.roundUpToMultiple(bitsperblock * 4096, 64) / 64;
+                    if (statelist.length == expectedLegacyStatelistLength) {
+                        dbp = new WordPackedArray(bitsperblock, 4096, statelist);
+                    } else {
+                        throw new StateListException(x, z, statelist.length, expectedStatelistLength, expectedLegacyStatelistLength);
+                    }
                 }
 
-                PackedIntegerArray db = new PackedIntegerArray(bitsperblock, 4096, statelist);
                 if (bitsperblock > 8) {    // Not palette
                     for (int j = 0; j < 4096; j++) {
-                        states[j] = DynmapBlockState.getStateByGlobalIndex(db.get(j));
+                        int v = db != null ? db.get(j) : dbp.get(j);
+                        states[j] = DynmapBlockState.getStateByGlobalIndex(v);
                     }
                 } else {
                     for (int j = 0; j < 4096; j++) {
-                        int v = db.get(j);
+                        int v = db != null ? db.get(j) : dbp.get(j);
                         states[j] = (v < palette.length) ? palette[v] : DynmapBlockState.AIR;
                     }
                 }