diff --git a/code/_onclick/hud/skybox.dm b/code/_onclick/hud/skybox.dm
index e4f93a2f617da..9b21e0b7243a0 100644
--- a/code/_onclick/hud/skybox.dm
+++ b/code/_onclick/hud/skybox.dm
@@ -23,9 +23,14 @@
 			screen |= skybox
 		skybox.screen_loc = "CENTER:[-224 - T.x],CENTER:[-224 - T.y]"
 
+/client/proc/deferred_update_skybox(rebuild)
+	set waitfor = FALSE
+	sleep(1)
+	update_skybox(rebuild)
+
 /mob/Login()
 	..()
-	client.update_skybox(1)
+	client.deferred_update_skybox(1)
 
 /mob/Move()
 	var/old_z = get_z(src)
diff --git a/code/controllers/subsystems/skybox.dm b/code/controllers/subsystems/skybox.dm
index f87d2cfe6ef1e..775b1edf332e4 100644
--- a/code/controllers/subsystems/skybox.dm
+++ b/code/controllers/subsystems/skybox.dm
@@ -42,6 +42,7 @@ SUBSYSTEM_DEF(skybox)
 		dust.blend_mode = BLEND_ADD
 		var/mutable_appearance/space = new /mutable_appearance(/turf/space)
 		space.icon_state = "white"
+		space.plane = SKYBOX_PLANE
 		space.AddOverlays(dust)
 		space_appearance_cache[index] = space.appearance
 	background_color = RANDOM_RGB