diff --git a/code/game/machinery/door_control.dm b/code/game/machinery/door_control.dm
index c4e9fd0230d..63251c2b688 100644
--- a/code/game/machinery/door_control.dm
+++ b/code/game/machinery/door_control.dm
@@ -80,12 +80,16 @@
 	if(normaldoorcontrol)
 		for(var/obj/machinery/door/airlock/D in range(range))
 			if(D.id_tag == src.id)
+				if(specialfunctions & OPEN)
+					if (D.density)
+						spawn(0)
+							D.open()
+							return
+					else
+						spawn(0)
+							D.close()
+							return
 				if(desiredstate == 1)
-					if(specialfunctions & OPEN)
-						if (D.density)
-							spawn( 0 )
-								D.open()
-								return
 					if(specialfunctions & IDSCAN)
 						D.aiDisabledIdScanner = 1
 					if(specialfunctions & BOLTS)
@@ -95,13 +99,7 @@
 						D.secondsElectrified = -1
 					if(specialfunctions & SAFE)
 						D.safe = 0
-
 				else
-					if(specialfunctions & OPEN)
-						if (!D.density)
-							spawn( 0 )
-								D.close()
-								return
 					if(specialfunctions & IDSCAN)
 						D.aiDisabledIdScanner = 0
 					if(specialfunctions & BOLTS)
@@ -186,4 +184,4 @@
 	icon_state = "launcherbtt"
 	active = 0
 
-	return
\ No newline at end of file
+	return