diff --git a/src/c3nav/routing/locator.py b/src/c3nav/routing/locator.py
index 878a92cb..58100402 100644
--- a/src/c3nav/routing/locator.py
+++ b/src/c3nav/routing/locator.py
@@ -96,6 +96,8 @@ class Locator:
             identifiers = []
             for bssid in beacon.addresses:
                 identifiers.append(TypedIdentifier(PeerType.WIFI, bssid))
+            if beacon.ap_name:
+                identifiers.append(TypedIdentifier(PeerType.WIFI, beacon.ap_name))
             if beacon.ibeacon_uuid and beacon.ibeacon_major is not None and beacon.ibeacon_minor is not None:
                 identifiers.append(
                     TypedIdentifier(PeerType.IBEACON, (beacon.ibeacon_uuid, beacon.ibeacon_major, beacon.ibeacon_minor))