diff --git a/code/game/turfs/space/space.dm b/code/game/turfs/space/space.dm
index 87ab3a48ae0..0fd7432660d 100644
--- a/code/game/turfs/space/space.dm
+++ b/code/game/turfs/space/space.dm
@@ -19,6 +19,8 @@
 		update_starlight() //MC will initialize all the space turfs that get created before config
 
 /turf/space/proc/update_starlight()
+	. = ..()
+
 	if(!config)	return
 	if(!config.starlight)
 		return
diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm
index 0392140834c..7adcbf2560c 100644
--- a/code/game/turfs/turf.dm
+++ b/code/game/turfs/turf.dm
@@ -38,7 +38,8 @@
 			src.Entered(AM)
 			return
 
-	if(!dynamic_lighting)
+	var/area/A = loc
+	if(!dynamic_lighting || !A.lighting_use_dynamic)
 		luminosity = 1
 
 // Adds the adjacent turfs to the current atmos processing
@@ -431,4 +432,4 @@
 			if(O.invisibility == 101)
 				O.singularity_act()
 	ChangeTurf(/turf/space)
-	return(2)
\ No newline at end of file
+	return(2)