diff --git a/code/game/machinery/computer/teleporter.dm b/code/game/machinery/computer/teleporter.dm
index 7261c44fc5..093f62c625 100644
--- a/code/game/machinery/computer/teleporter.dm
+++ b/code/game/machinery/computer/teleporter.dm
@@ -161,12 +161,18 @@
 	var/list/areaindex = list()
 	if(regime_set == "Teleporter")
 		for(var/obj/item/device/radio/beacon/R in GLOB.teleportbeacons)
+<<<<<<< HEAD
 			var/turf/T = get_turf(R)
 			if(!T)
 				continue
 			if(T.z == ZLEVEL_CENTCOM || T.z > ZLEVEL_SPACEMAX)
 				continue
 			L[avoid_assoc_duplicate_keys(T.loc.name, areaindex)] = R
+=======
+			if(is_eligible(R))
+				var/area/A = get_area(R)
+				L[avoid_assoc_duplicate_keys(A.name, areaindex)] = R
+>>>>>>> 646672e... Merge pull request #33917 from AutomaticFrenzy/patch/beacon-name
 
 		for(var/obj/item/implant/tracking/I in GLOB.tracked_implants)
 			if(!I.imp_in || !ismob(I.loc))
@@ -192,12 +198,18 @@
 			to_chat(user, "<span class='alert'>No connected stations located.</span>")
 			return
 		for(var/obj/machinery/teleport/station/R in S)
+<<<<<<< HEAD
 			var/turf/T = get_turf(R)
 			if(!T || !R.teleporter_hub || !R.teleporter_console)
 				continue
 			if(T.z == ZLEVEL_CENTCOM || T.z > ZLEVEL_SPACEMAX)
 				continue
 			L[avoid_assoc_duplicate_keys(T.loc.name, areaindex)] = R
+=======
+			if(is_eligible(R))
+				var/area/A = get_area(R)
+				L[avoid_assoc_duplicate_keys(A.name, areaindex)] = R
+>>>>>>> 646672e... Merge pull request #33917 from AutomaticFrenzy/patch/beacon-name
 		var/desc = input("Please select a station to lock in.", "Locking Computer") as null|anything in L
 		target = L[desc]
 		if(target)