diff --git a/modules/core/context.js b/modules/core/context.js
index 695f848f80..c4e7d2c073 100644
--- a/modules/core/context.js
+++ b/modules/core/context.js
@@ -214,7 +214,7 @@ export function coreContext() {
     });
   };
 
-  let _minEditableZoom = 16;
+  let _minEditableZoom = localStorage.allowEditAtLowZoom ? 14 : 16;
   context.minEditableZoom = function(val) {
     if (!arguments.length) return _minEditableZoom;
     _minEditableZoom = val;
diff --git a/modules/ui/panels/progress.js b/modules/ui/panels/progress.js
index c3d03f676d..bb4e16ffd9 100644
--- a/modules/ui/panels/progress.js
+++ b/modules/ui/panels/progress.js
@@ -67,7 +67,7 @@ export function uiPanelProgress(context) {
         const { next, zoom } = getNext();
         if (!next) return;
 
-        context.map().centerZoomEase(next.geo, /* zoom */ Math.max(zoom, 16), /* transition time */ 0);
+        context.map().centerZoomEase(next.geo, /* zoom */ Math.max(zoom, context.minEditableZoom()), /* transition time */ 0);
 
         // select the RapiD feature to open the sidebar
         context