diff --git a/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/ChunkMetaListener.java b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/ChunkMetaListener.java
index c25ee78ea..ed1740999 100644
--- a/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/ChunkMetaListener.java
+++ b/plugins/civmodcore-paper/src/main/java/vg/civcraft/mc/civmodcore/world/locations/chunkmeta/ChunkMetaListener.java
@@ -34,13 +34,17 @@ public class ChunkMetaListener implements Listener {
         this.viewTracker = viewTracker;
         this.unloadQueue = new LinkedBlockingQueue<>();
         unloadConsumer = new Thread(() -> {
-            while (true) {
-                try {
-                    Chunk chunk = unloadQueue.take();
-                    manager.unloadChunkData(chunk);
-                } catch (RuntimeException | InterruptedException e) {
-                    CHUNK_META_LOGGER.warn("Handling chunk unloads", e);
+            try {
+                while (true) {
+                    try {
+                        Chunk chunk = unloadQueue.take();
+                        manager.unloadChunkData(chunk);
+                    } catch (RuntimeException e) {
+                        CHUNK_META_LOGGER.warn("Handling chunk unloads", e);
+                    }
                 }
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
             }
         }, "CivModCore chunk unload handler");
         unloadConsumer.start();