diff --git a/website/src/lib/components/toolbar/tools/waypoint/Waypoint.svelte b/website/src/lib/components/toolbar/tools/waypoint/Waypoint.svelte
index f9ba240ff..5002553d0 100644
--- a/website/src/lib/components/toolbar/tools/waypoint/Waypoint.svelte
+++ b/website/src/lib/components/toolbar/tools/waypoint/Waypoint.svelte
@@ -111,6 +111,14 @@
     }
 
     function setCoordinates(e: any) {
+        if (
+            $map?.queryRenderedFeatures(e.point, {
+                layers: $map.getLayersOrder().filter((layerId) => layerId.endsWith('-waypoints')),
+            }).length
+        ) {
+            // Clicked on a waypoint, ignoring
+            return;
+        }
         latitude = e.lngLat.lat.toFixed(6);
         longitude = e.lngLat.lng.toFixed(6);
     }