diff --git a/core/src/main/java/com/seibel/distanthorizons/core/generation/IWorldGenerationQueue.java b/core/src/main/java/com/seibel/distanthorizons/core/generation/IWorldGenerationQueue.java
index 127669592..352082edd 100644
--- a/core/src/main/java/com/seibel/distanthorizons/core/generation/IWorldGenerationQueue.java
+++ b/core/src/main/java/com/seibel/distanthorizons/core/generation/IWorldGenerationQueue.java
@@ -22,7 +22,6 @@ package com.seibel.distanthorizons.core.generation;
 import com.seibel.distanthorizons.core.generation.tasks.IWorldGenTaskTracker;
 import com.seibel.distanthorizons.core.generation.tasks.WorldGenResult;
 import com.seibel.distanthorizons.core.pos.DhBlockPos2D;
-import com.seibel.distanthorizons.core.pos.DhLodPos;
 import com.seibel.distanthorizons.core.pos.DhSectionPos;
 
 import java.io.Closeable;
@@ -37,7 +36,7 @@ public interface IWorldGenerationQueue extends Closeable
 	void cancelGenTasks(Iterable<DhSectionPos> positions);
 	
 	/** @param targetPos the position that world generation should be centered around, generally this will be the player's position. */
-	void runCurrentGenTasksUntilBusy(DhBlockPos2D targetPos);
+	void startGenerationQueueAndSetTargetPos(DhBlockPos2D targetPos);
 	
 	int getWaitingTaskCount();
 	int getInProgressTaskCount();
diff --git a/core/src/main/java/com/seibel/distanthorizons/core/generation/WorldGenerationQueue.java b/core/src/main/java/com/seibel/distanthorizons/core/generation/WorldGenerationQueue.java
index a52d8d43f..6e67176b4 100644
--- a/core/src/main/java/com/seibel/distanthorizons/core/generation/WorldGenerationQueue.java
+++ b/core/src/main/java/com/seibel/distanthorizons/core/generation/WorldGenerationQueue.java
@@ -82,7 +82,7 @@ public class WorldGenerationQueue implements IWorldGenerationQueue, IDebugRender
 	//  1. allow the generator to deal with larger sections (let the generator threads split up larger tasks into smaller one
 	//  2. batch requests better. instead of sending 4 individual tasks of detail level N, send 1 task of detail level n+1
 	private final ExecutorService queueingThread = ThreadUtil.makeSingleThreadPool("World Gen Queue");
-	private boolean generationQueueStarted = false;
+	private boolean generationQueueRunning = false;
 	private DhBlockPos2D generationTargetPos = DhBlockPos2D.ZERO;
 	/** can be used for debugging how many tasks are currently in the queue */
 	private int numberOfTasksQueued = 0;
@@ -179,39 +179,26 @@ public class WorldGenerationQueue implements IWorldGenerationQueue, IDebugRender
 		// TODO Should we cancel generation of chunks that were loaded by the player?
 	}
 	
+	
+	
 	//===============//
 	// running tasks //
 	//===============//
 	
-	public void runCurrentGenTasksUntilBusy(DhBlockPos2D targetPos)
+	public void startGenerationQueueAndSetTargetPos(DhBlockPos2D targetPos)
 	{
-		generator.preGeneratorTaskStart();
-		try
+		// update the target pos
+		this.generationTargetPos = targetPos;
+		
+		// ensure the queuing thread is running
+		if (!this.generationQueueRunning)
 		{
-			// the generator is shutting down, don't attempt to generate anything
-			if (this.generatorClosingFuture != null)
-			{
-				return;
-			}
-			
-			
-			// update the target pos
-			this.generationTargetPos = targetPos;
-			
-			// only start the queuing thread once
-			if (!this.generationQueueStarted)
-			{
-				this.startWorldGenQueuingThread();
-			}
-		}
-		catch (Exception e)
-		{
-			LOGGER.error(e.getMessage(), e);
+			this.startWorldGenQueuingThread();
 		}
 	}
 	private void startWorldGenQueuingThread()
 	{
-		this.generationQueueStarted = true;
+		this.generationQueueRunning = true;
 		
 		// queue world generation tasks on its own thread since this process is very slow and would lag the server thread
 		this.queueingThread.execute(() ->
@@ -221,6 +208,7 @@ public class WorldGenerationQueue implements IWorldGenerationQueue, IDebugRender
 				// loop until the generator is shutdown
 				while (!Thread.interrupted())
 				{
+					this.generator.preGeneratorTaskStart();
 					
 					// queue generation tasks until the generator is full, or there are no more tasks to generate
 					boolean taskStarted = true;
@@ -244,7 +232,7 @@ public class WorldGenerationQueue implements IWorldGenerationQueue, IDebugRender
 			catch (Exception e)
 			{
 				LOGGER.error("queueing exception: " + e.getMessage(), e);
-				this.generationQueueStarted = false;
+				this.generationQueueRunning = false;
 			}
 		});
 	}
diff --git a/core/src/main/java/com/seibel/distanthorizons/core/level/WorldGenModule.java b/core/src/main/java/com/seibel/distanthorizons/core/level/WorldGenModule.java
index 912f8bd6c..2a6e8ac71 100644
--- a/core/src/main/java/com/seibel/distanthorizons/core/level/WorldGenModule.java
+++ b/core/src/main/java/com/seibel/distanthorizons/core/level/WorldGenModule.java
@@ -111,8 +111,7 @@ public class WorldGenModule implements Closeable
 		AbstractWorldGenState worldGenState = this.worldGenStateRef.get();
 		if (worldGenState != null)
 		{
-			// queue new world generation requests
-			worldGenState.tick(targetPosForGeneration);
+			worldGenState.startGenerationQueueAndSetTargetPos(targetPosForGeneration);
 		}
 	}
 	
@@ -178,7 +177,7 @@ public class WorldGenModule implements Closeable
 		}
 		
 		/** @param targetPosForGeneration the position that world generation should be centered around */
-		public void tick(DhBlockPos2D targetPosForGeneration) { this.worldGenerationQueue.runCurrentGenTasksUntilBusy(targetPosForGeneration); }
+		public void startGenerationQueueAndSetTargetPos(DhBlockPos2D targetPosForGeneration) { this.worldGenerationQueue.startGenerationQueueAndSetTargetPos(targetPosForGeneration); }
 	}
 	
 }