diff --git a/www/assets/js/map_leaflet.js b/www/assets/js/map_leaflet.js
index 2f7aa50..dc18f69 100644
--- a/www/assets/js/map_leaflet.js
+++ b/www/assets/js/map_leaflet.js
@@ -34,7 +34,13 @@ function leafletMap() {
     }
 
     map.locateControl = L.control.locate({
-        flyTo: true,
+        flyTo: false, // Hopefully this will lower the number of map tile requests when location is found
+        showPopup: false,
+        locateOptions: {
+            enableHighAccuracy: true,
+            maxZoom: 18
+        },
+        setView: "untilPan",
         icon: "far fa-compass",
         iconLoading: "far fa-compass fa-spin"
     }).addTo(map);