diff --git a/js/id/renderer/map.js b/js/id/renderer/map.js
index 846849844..bfbd1efab 100644
--- a/js/id/renderer/map.js
+++ b/js/id/renderer/map.js
@@ -365,6 +365,7 @@ iD.Map = function() {
         var scale = 256 * Math.pow(2, z),
             center = pxCenter(),
             l = pointLocation(center);
+        scale = Math.max(1024, Math.min(256 * Math.pow(2, 24), scale));
         projection.scale(scale);
         zoom.scale(projection.scale());
         var t = projection.translate();