diff --git a/index.php b/index.php
index 435d9e89..d941b83e 100644
--- a/index.php
+++ b/index.php
@@ -45,7 +45,7 @@ html_export_var(array(
   <link rel="stylesheet" href="node_modules/leaflet.locatecontrol/dist/L.Control.Locate.min.css" />
   <link rel="stylesheet" href="node_modules/leaflet.polylinemeasure/Leaflet.PolylineMeasure.css" />
   <script src="node_modules/leaflet/dist/leaflet.js"></script>
-  <script src="node_modules/leaflet.locatecontrol/dist/L.Control.Locate.min.js"></script>
+  <script src="node_modules/leaflet.locatecontrol/src/L.Control.Locate.js"></script>
   <script src="node_modules/leaflet-textpath/leaflet.textpath.js"></script>
   <script src="node_modules/leaflet-polylineoffset/leaflet.polylineoffset.js"></script>
   <script src="node_modules/leaflet.polylinemeasure/Leaflet.PolylineMeasure.js"></script>
diff --git a/package.json b/package.json
index 8ce636ff..0c8e6f1a 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,7 @@
     "leaflet-geosearch": "^2.4.0",
     "leaflet-polylineoffset": "^1.1.0",
     "leaflet-textpath": "git+https://github.com/makinacorpus/Leaflet.TextPath.git#leaflet0.8-dev",
-    "leaflet.locatecontrol": "^0.61.0",
+    "leaflet.locatecontrol": "git+https://github.com/plepe/leaflet-locatecontrol.git#initialZoomLevel",
     "leaflet.polylinemeasure": "git+https://github.com/ppete2/Leaflet.PolylineMeasure.git",
     "md5": "^2.2.1",
     "measure-ts": "^3.3.2",
diff --git a/src/PluginGeoLocate.js b/src/PluginGeoLocate.js
index be4aa2a4..33cdb548 100644
--- a/src/PluginGeoLocate.js
+++ b/src/PluginGeoLocate.js
@@ -2,10 +2,11 @@ register_hook('init', function () {
   // Geo location
   L.control.locate({
     locateOptions: {
-      enableHighAccuracy: true,
-      maxZoom: 17
+      enableHighAccuracy: true
     },
     flyTo: true,
+    keepCurrentZoomLevel: true,
+    initialZoomLevel: 17,
     drawCircle: true,
     circleStyle: {
       weight: 0,