diff --git a/code/controllers/master_controller.dm b/code/controllers/master_controller.dm
index a1ac4c2a19..e018eb0eba 100644
--- a/code/controllers/master_controller.dm
+++ b/code/controllers/master_controller.dm
@@ -60,9 +60,6 @@ datum/controller/game_controller/proc/setup()
 	if(!ticker)
 		ticker = new /datum/controller/gameticker()
 
-
-	lighting_controller.Initialize()
-
 	setup_objects()
 	setupgenetics()
 	setupfactions()
@@ -74,6 +71,7 @@ datum/controller/game_controller/proc/setup()
 	spawn(0)
 		if(ticker)
 			ticker.pregame()
+		lighting_controller.Initialize()
 
 datum/controller/game_controller/proc/setup_objects()
 	world << "\red \b Initializing objects"