diff --git a/code/_onclick/hud/skybox.dm b/code/_onclick/hud/skybox.dm
index 492a11e588..c6a3d5d259 100644
--- a/code/_onclick/hud/skybox.dm
+++ b/code/_onclick/hud/skybox.dm
@@ -44,17 +44,10 @@
 	. = ..()
 	client.update_skybox(TRUE)
 
-/mob/Move()
-	var/old_z = get_z(src)
-	. = ..()
-	if(. && client)
-		client.update_skybox(old_z != get_z(src))
-
-/mob/forceMove()
-	var/old_z = get_z(src)
-	. = ..()
-	if(. && client)
-		client.update_skybox(old_z != get_z(src))
+/mob/onTransitZ(old_z, new_z)
+	..()
+	if(old_z != new_z)
+		client?.update_skybox(TRUE)
 
 /mob/set_viewsize()
 	. = ..()
diff --git a/code/controllers/subsystems/skybox.dm b/code/controllers/subsystems/skybox.dm
index 356458517d..bf44a8f2ef 100644
--- a/code/controllers/subsystems/skybox.dm
+++ b/code/controllers/subsystems/skybox.dm
@@ -109,7 +109,11 @@ SUBSYSTEM_DEF(skybox)
 		skybox_cache["[z]"] = generate_skybox(z)
 
 	for(var/client/C)
-		C.update_skybox(1)
+		var/their_z = get_z(C.mob)
+		if(!their_z) //Nullspace
+			continue
+		if(their_z in zlevels)
+			C.update_skybox(1)
 
 // Settings datum that maps can override to play with their skyboxes
 /datum/skybox_settings