diff --git a/core/src/main/java/com/seibel/distanthorizons/core/api/internal/SharedApi.java b/core/src/main/java/com/seibel/distanthorizons/core/api/internal/SharedApi.java
index 85d4290d7..65da1cfe2 100644
--- a/core/src/main/java/com/seibel/distanthorizons/core/api/internal/SharedApi.java
+++ b/core/src/main/java/com/seibel/distanthorizons/core/api/internal/SharedApi.java
@@ -609,6 +609,11 @@ public class SharedApi
 			}
 			
 			DhChunkPos closest = this.closestQueue.poll();
+			if (closest == null)
+			{
+				return null;
+			}
+			
 			this.furthestQueue.remove(closest);
 			return this.updateDataByChunkPos.remove(closest);
 		}