diff --git a/src/main/java/me/youhavetrouble/blockedit/api/OperationWork.java b/src/main/java/me/youhavetrouble/blockedit/api/OperationWork.java
index aecc465..cbd9e10 100644
--- a/src/main/java/me/youhavetrouble/blockedit/api/OperationWork.java
+++ b/src/main/java/me/youhavetrouble/blockedit/api/OperationWork.java
@@ -52,6 +52,11 @@ public class OperationWork {
             }
             for (int i = 0; i < chunksPerTick; i++) {
                 int chunkWorkIndex = chunksLeft.getAndDecrement();
+                if (chunkWorkIndex < 0) {
+                    this.finished = true;
+                    task.cancel();
+                    return;
+                }
                 ChunkWork chunkWork = chunkWorkList.get(chunkWorkIndex);
                 World world = selection.getWorld();
                 if (world == null) return;