diff --git a/www/assets/js/map_leaflet.js b/www/assets/js/map_leaflet.js
index cd47009..101c053 100644
--- a/www/assets/js/map_leaflet.js
+++ b/www/assets/js/map_leaflet.js
@@ -26,12 +26,11 @@ function leafletMap() {
     map.locateControl = L.control.locate({
         flyTo: false, // Hopefully this will lower the number of map tile requests when location is found
         showPopup: false,
-        keepCurrentZoomLevel: true, // Stop it from snapping back to max zoom
         locateOptions: {
             enableHighAccuracy: true,
-            maxZoom: 18
+            maxZoom: 16
         },
-        setView: "untilPan",
+        setView: "untilPanOrZoom",
         icon: "far fa-compass",
         iconLoading: "far fa-compass fa-spin"
     }).addTo(map);