diff --git a/code/game/turfs/change_turf.dm b/code/game/turfs/change_turf.dm
index 48d4563f51..e9a5cb160f 100644
--- a/code/game/turfs/change_turf.dm
+++ b/code/game/turfs/change_turf.dm
@@ -156,11 +156,12 @@ GLOBAL_LIST_INIT(blacklisted_automated_baseturfs, typecacheof(list(
 	else
 		flags |= CHANGETURF_RECALC_ADJACENT
 		if(ispath(path,/turf/closed))
+			. = ..()
 			update_air_ref(-1)
-			. = ..()
 		else
+			qdel(src.air)
+			src.air = null
 			. = ..()
-			air = null
 			Initalize_Atmos(0)
 
 // Take off the top layer turf and replace it with the next baseturf down
diff --git a/code/game/turfs/open.dm b/code/game/turfs/open.dm
index aa5e02819c..dcf687d53f 100644
--- a/code/game/turfs/open.dm
+++ b/code/game/turfs/open.dm
@@ -218,11 +218,10 @@
 			flash_color(L, flash_color = "#C80000", flash_time = 10)
 
 /turf/open/Initalize_Atmos(times_fired)
-	if(!blocks_air)
-		if(!istype(air,/datum/gas_mixture/turf))
-			air = new(2500,src)
-		air.copy_from_turf(src)
-		update_air_ref(planetary_atmos ? 1 : 2)
+	if(!istype(air,/datum/gas_mixture/turf))
+		air = new(2500,src)
+	air.copy_from_turf(src)
+	update_air_ref(planetary_atmos ? 1 : 2)
 
 	update_visuals()