diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm
index e1c50f90d1..d30f70532b 100644
--- a/code/controllers/configuration.dm
+++ b/code/controllers/configuration.dm
@@ -232,7 +232,7 @@ var/list/gamemode_cache = list()
 	var/dooc_allowed = 1
 	var/dsay_allowed = 1
 
-	var/starlight = 0	// Whether space turfs have ambient light or not
+	var/static/starlight = 0	// Whether space turfs have ambient light or not
 
 	var/list/ert_species = list(SPECIES_HUMAN)
 
diff --git a/code/game/turfs/space/space.dm b/code/game/turfs/space/space.dm
index c0dc77fdfc..793942ecbe 100644
--- a/code/game/turfs/space/space.dm
+++ b/code/game/turfs/space/space.dm
@@ -13,14 +13,12 @@
 	var/forced_dirs = 0 //Force this one to pretend it's an overedge turf
 
 /turf/space/Initialize()
-	. = ..()
-
 	if(config.starlight)
 		update_starlight()
 
 	//Sprite stuff only beyond here
 	if(keep_sprite)
-		return .
+		return ..()
 
 	//We might be an edge
 	if(y == world.maxy || forced_dirs & NORTH)
@@ -38,6 +36,8 @@
 	else //Dust
 		appearance = SSskybox.dust_cache["[((x + y) ^ ~(x * y) + z) % 25]"]
 
+	return ..()
+
 /turf/space/proc/toggle_transit(var/direction)
 	if(edge) //Not a great way to do this yet. Maybe we'll come up with one. We could pre-make sprites... or tile the overlay over it?
 		return