diff --git a/src/Map/Leaflet_Map.tsx b/src/Map/Leaflet_Map.tsx
index b1295e8..7d77e7e 100644
--- a/src/Map/Leaflet_Map.tsx
+++ b/src/Map/Leaflet_Map.tsx
@@ -327,8 +327,8 @@ export class Leaflet_Map extends enhance.Base {
         const imagery = this.current_imagery_resource();
         const view_config = this.map2d_tile_view();
         const display_maximum_level = Math.max(imagery.minimum_level, Math.min(view_config.tile_display_maximum_level, 24));
-        const max_zoom = view_config.tile_zoom_mode === "native" ? Math.min(imagery.maximum_level, display_maximum_level) : display_maximum_level;
         const max_native_zoom = Math.min(imagery.maximum_level, display_maximum_level);
+        const max_zoom = Math.max(imagery.maximum_level, display_maximum_level, 24);
         this.map.setMinZoom(imagery.minimum_level);
         this.map.setMaxZoom(max_zoom);
         if (this.map.getZoom() > max_zoom) {