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 65da1cfe2..db4043198 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
@@ -562,8 +562,11 @@ public class SharedApi
 			if (remainingSlots <= 0)
 			{
 				DhChunkPos furthest = this.furthestQueue.poll();
-				this.closestQueue.remove(furthest);
-				this.updateDataByChunkPos.remove(furthest);
+				if (furthest != null)
+				{
+					this.closestQueue.remove(furthest);
+					this.updateDataByChunkPos.remove(furthest);
+				}
 			}
 			
 			this.updateDataByChunkPos.put(pos, updateData);