diff --git a/code/game/machinery/embedded_controller/mapping_helpers.dm b/code/game/machinery/embedded_controller/mapping_helpers.dm
index cd48226cedf..bfeefa0839b 100644
--- a/code/game/machinery/embedded_controller/mapping_helpers.dm
+++ b/code/game/machinery/embedded_controller/mapping_helpers.dm
@@ -145,6 +145,10 @@ Any frequency works, it's self-setting, but it seems like people have decided 13
 /obj/effect/map_helper/airlock/sensor/setup()
 	var/obj/machinery/airlock_sensor/my_sensor = my_device
 	my_sensor.id_tag = my_controller.id_tag + tag_addon
+<<<<<<< HEAD
+=======
+	my_sensor.master_tag = my_controller.id_tag
+>>>>>>> 98fe590... Merge pull request #6937 from VOREStation/pol-dockhelpers
 	my_sensor.frequency = my_controller.frequency
 	my_sensor.set_frequency(my_controller.frequency)
 	if(command)