diff --git a/website/src/lib/components/map/map-layer-event-manager.ts b/website/src/lib/components/map/map-layer-event-manager.ts
index 95e7e70f0..29412098c 100644
--- a/website/src/lib/components/map/map-layer-event-manager.ts
+++ b/website/src/lib/components/map/map-layer-event-manager.ts
@@ -263,6 +263,7 @@ export class MapLayerEventManager {
         lngLat: maplibregl.LngLat
     ): string[] {
         let result = layerIds.filter((layerId) => {
+            if (!this._map.getLayer(layerId)) return false;
             const fileId = layerId.replace('-waypoints', '');
             if (fileId === layerId) {
                 return fileStateCollection.getStatistics(fileId)?.inBBox(lngLat) ?? true;