diff --git a/core/src/main/java/com/seibel/distanthorizons/core/api/internal/ServerApi.java b/core/src/main/java/com/seibel/distanthorizons/core/api/internal/ServerApi.java
index 241fb7ae9..dd552a0a2 100644
--- a/core/src/main/java/com/seibel/distanthorizons/core/api/internal/ServerApi.java
+++ b/core/src/main/java/com/seibel/distanthorizons/core/api/internal/ServerApi.java
@@ -194,7 +194,6 @@ public class ServerApi
 				{
 					// If MC's lighting engine isn't thread safe this may cause the server thread to lag
 					chunkWrapper.bakeDhLightingUsingMcLightingEngine();
-					chunkWrapper.setUseDhLighting(true);
 				}
 				catch (IllegalStateException e)
 				{
@@ -208,7 +207,6 @@ public class ServerApi
 				ArrayList<IChunkWrapper> nearbyChunkList = new ArrayList<>(1);
 				nearbyChunkList.add(chunkWrapper);
 				DhLightingEngine.INSTANCE.lightChunk(chunkWrapper, nearbyChunkList, level.hasSkyLight() ? 15 : 0);
-				chunkWrapper.setUseDhLighting(true);
 			}
 			
 			dhLevel.updateChunkAsync(chunkWrapper);
diff --git a/core/src/main/java/com/seibel/distanthorizons/core/generation/DhLightingEngine.java b/core/src/main/java/com/seibel/distanthorizons/core/generation/DhLightingEngine.java
index bd4c9cf04..d5d2fc1fe 100644
--- a/core/src/main/java/com/seibel/distanthorizons/core/generation/DhLightingEngine.java
+++ b/core/src/main/java/com/seibel/distanthorizons/core/generation/DhLightingEngine.java
@@ -198,6 +198,7 @@ public class DhLightingEngine
 		
 		
 		centerChunk.setIsDhLightCorrect(true);
+		centerChunk.setUseDhLighting(true);
 		LOGGER.trace("Finished generating lighting for chunk: [" + centerChunkPos + "]");
 	}
 	
diff --git a/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/chunk/IChunkWrapper.java b/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/chunk/IChunkWrapper.java
index f5a45a22e..b80f677d7 100644
--- a/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/chunk/IChunkWrapper.java
+++ b/core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/chunk/IChunkWrapper.java
@@ -101,6 +101,7 @@ public interface IChunkWrapper extends IBindable
 		}
 		
 		this.setIsDhLightCorrect(true);
+		this.setUseDhLighting(true);
 	}