diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13to1_12_2/storage/BlockConnectionStorage.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13to1_12_2/storage/BlockConnectionStorage.java
index 96bdb45c9..2972b33ad 100644
--- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13to1_12_2/storage/BlockConnectionStorage.java
+++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13to1_12_2/storage/BlockConnectionStorage.java
@@ -45,7 +45,8 @@ public class BlockConnectionStorage extends StoredObject {
 
     public void remove(Position position) {
         long pair = getChunkSectionIndex(position);
-        short[] map = getChunkSection(pair);
+        short[] map = blockStorage.get(pair);
+        if (map == null) return;
         map[encodeBlockPos(position)] = 0;
         if (Arrays.equals(short4096, map)) {
             blockStorage.remove(pair);