diff --git a/src/main/java/org/embeddedt/modernfix/common/mixin/perf/release_protochunks/ChunkHolderMixin.java b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/release_protochunks/ChunkHolderMixin.java
index fa1401c3..e72084f5 100644
--- a/src/main/java/org/embeddedt/modernfix/common/mixin/perf/release_protochunks/ChunkHolderMixin.java
+++ b/src/main/java/org/embeddedt/modernfix/common/mixin/perf/release_protochunks/ChunkHolderMixin.java
@@ -68,7 +68,9 @@ public abstract class ChunkHolderMixin extends GenerationChunkHolder implements
             // register for suspension check when chain completes
             var map = ((ISuspendedHolderTrackingChunkMap)this.playerProvider);
             this.saveSync.whenCompleteAsync((r, e) -> {
-                map.mfix$markForSuspensionCheck(this.pos);
+                if (this.getLatestChunk() != null) {
+                    map.mfix$markForSuspensionCheck(this.pos);
+                }
             }, map.mfix$getMainThreadExecutor());
         }
     }