diff --git a/core/src/main/java/com/seibel/distanthorizons/core/render/LodQuadTree.java b/core/src/main/java/com/seibel/distanthorizons/core/render/LodQuadTree.java
index f10e6c8fe..bc9761931 100644
--- a/core/src/main/java/com/seibel/distanthorizons/core/render/LodQuadTree.java
+++ b/core/src/main/java/com/seibel/distanthorizons/core/render/LodQuadTree.java
@@ -308,7 +308,7 @@ public class LodQuadTree extends QuadTree<LodRenderSection> implements AutoClose
 			{
 				// prepare this section for rendering
 				// TODO this should fire for the lowest detail level first to improve loading speed
-				if (!renderSection.renderSourceLoading && renderSection.renderBuffer == null)
+				if (!renderSection.loadingRenderSource() && renderSection.renderBuffer == null)
 				{
 					renderSection.loadRenderSourceAsync();
 				}
diff --git a/core/src/main/java/com/seibel/distanthorizons/core/render/LodRenderSection.java b/core/src/main/java/com/seibel/distanthorizons/core/render/LodRenderSection.java
index ea1a2bb4e..289e2c332 100644
--- a/core/src/main/java/com/seibel/distanthorizons/core/render/LodRenderSection.java
+++ b/core/src/main/java/com/seibel/distanthorizons/core/render/LodRenderSection.java
@@ -62,7 +62,7 @@ public class LodRenderSection implements IDebugRenderable, AutoCloseable
 	public ColumnRenderBuffer renderBuffer; 
 	
 	
-	public boolean renderSourceLoading = false;
+	private CompletableFuture<Void> renderSourceLoadingFuture = null;
 	private boolean canRender = false;
 	
 	private boolean missingPositionsCalculated = false;
@@ -92,11 +92,10 @@ public class LodRenderSection implements IDebugRenderable, AutoCloseable
 	
 	public void loadRenderSourceAsync()
 	{
-		if (this.renderSourceLoading)
+		if (this.renderSourceLoadingFuture != null)
 		{
 			return;
 		}
-		this.renderSourceLoading = true;
 		
 		
 		
@@ -108,7 +107,8 @@ public class LodRenderSection implements IDebugRenderable, AutoCloseable
 			return;
 		}
 		
-		executor.execute(() -> 
+		
+		this.renderSourceLoadingFuture = CompletableFuture.runAsync(() -> 
 		{
 			FullDataSourceV2 fullDataSource = null;
 			ColumnRenderSource[] adjacentRenderSections = null;
@@ -161,9 +161,9 @@ public class LodRenderSection implements IDebugRenderable, AutoCloseable
 				}
 				catch (Exception ignore){ }
 				
-				this.renderSourceLoading = false;
+				this.renderSourceLoadingFuture = null;
 			}
-		});
+		}, executor);
 	}
 	/** Should be called on the {@link ThreadPoolUtil#getFileHandlerExecutor()} */
 	private ColumnRenderSource[] getAndCreateNeighborRenderSources()
@@ -195,6 +195,8 @@ public class LodRenderSection implements IDebugRenderable, AutoCloseable
 	
 	public boolean canRender() { return this.canRender; }
 	
+	public boolean loadingRenderSource() { return this.renderSourceLoadingFuture != null; }
+	
 	
 	
 	//=================================//
@@ -267,6 +269,11 @@ public class LodRenderSection implements IDebugRenderable, AutoCloseable
 		{
 			this.renderBuffer.close();
 		}
+		
+		if (this.renderSourceLoadingFuture != null)
+		{
+			this.renderSourceLoadingFuture.cancel(true);
+		}
 	}
 	
 	@Override
@@ -277,7 +284,7 @@ public class LodRenderSection implements IDebugRenderable, AutoCloseable
 		{
 			color = Color.green;
 		}
-		else if (this.renderSourceLoading)
+		else if (this.renderSourceLoadingFuture != null)
 		{
 			color = Color.yellow;
 		}