diff --git a/code/modules/mapping/access_helpers.dm b/code/modules/mapping/access_helpers.dm
index 5b9e943e04d..6b6506c6fc2 100644
--- a/code/modules/mapping/access_helpers.dm
+++ b/code/modules/mapping/access_helpers.dm
@@ -5,9 +5,6 @@
 
 // These are mutually exclusive; can't have req_any and req_all
 /obj/effect/mapping_helpers/airlock/access/any/payload(obj/machinery/door/airlock/airlock)
-	if(is_type_in_list(airlock, blacklist))
-		return
-
 	if(length(airlock.req_access))
 		log_world("[src] at [AREACOORD(src)] tried to set req_one_access, but req_access was already set!")
 		return
@@ -16,9 +13,6 @@
 	airlock.req_one_access |= access
 
 /obj/effect/mapping_helpers/airlock/access/all/payload(obj/machinery/door/airlock/airlock)
-	if(is_type_in_list(airlock, blacklist))
-		return
-
 	if(length(airlock.req_one_access))
 		log_world("[src] at [AREACOORD(src)] tried to set req_access, but req_one_access was already set!")
 		return
diff --git a/code/modules/mapping/mapping_helpers.dm b/code/modules/mapping/mapping_helpers.dm
index 784f6672c1c..ce504e0e2f0 100644
--- a/code/modules/mapping/mapping_helpers.dm
+++ b/code/modules/mapping/mapping_helpers.dm
@@ -91,11 +91,17 @@
 
 /obj/effect/mapping_helpers/airlock/LateInitialize()
 	. = ..()
-	if(!(locate(/obj/machinery/door) in get_turf(src)))
-		log_world("[src] failed to find an airlock at [AREACOORD(src)]")
 
+	var/list/valid_airlocks = list()
 	for(var/obj/machinery/door/D in get_turf(src))
-		payload(D)
+		if(!is_type_in_list(D, blacklist))
+			valid_airlocks += D
+
+	if(length(valid_airlocks))
+		for(var/obj/machinery/door/D in valid_airlocks)
+			payload(D)
+	else
+		log_world("[src] failed to find any valid airlocks at [AREACOORD(src)]")
 
 	qdel(src)