diff --git a/code/game/turfs/turf_changing.dm b/code/game/turfs/turf_changing.dm
index 3b5a797c0a0..5e5d3d9bafd 100644
--- a/code/game/turfs/turf_changing.dm
+++ b/code/game/turfs/turf_changing.dm
@@ -26,10 +26,9 @@
 	if (!N)
 		return
 
-	// This makes sure that turfs are not changed to space when one side is part of a zone
 	if(N == /turf/space)
 		var/turf/below = GetBelow(src)
-		if(istype(below) && (air_master.has_valid_zone(below) || air_master.has_valid_zone(src)))
+		if(istype(below) && !istype(below,/turf/space))
 			N = /turf/simulated/open
 
 	var/obj/fire/old_fire = fire
diff --git a/code/modules/multiz/movement.dm b/code/modules/multiz/movement.dm
index 24dfd80fa93..1f245ba3a31 100644
--- a/code/modules/multiz/movement.dm
+++ b/code/modules/multiz/movement.dm
@@ -151,6 +151,9 @@
 	if(!below)
 		return
 
+	if(istype(below, /turf/space))
+		return
+
 	var/turf/T = loc
 	if(!T.CanZPass(src, DOWN) || !below.CanZPass(src, DOWN))
 		return