diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index 53c8a341d23..e023131b2f6 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -1096,7 +1096,7 @@ About the new airlock wires panel:
 		spawn(150)
 			autoclose()
 	else if(autoclose && !normalspeed)
-		spawn(5)
+		spawn(11)
 			autoclose()
 
 	return ..()
@@ -1148,8 +1148,9 @@ About the new airlock wires panel:
 	operating = 0
 	air_update_turf(1)
 	update_freelook_sight()
-	if(locate(/mob/living) in get_turf(src))
-		open()
+	if(safe)
+		if(locate(/mob/living) in get_turf(src))
+			open()
 	return 1
 
 /obj/machinery/door/airlock/New()