diff --git a/app/src/main/java/com/geeksville/mesh/ui/map/MapViewWithLifecycle.kt b/app/src/main/java/com/geeksville/mesh/ui/map/MapViewWithLifecycle.kt
index b4e9001c9..8c0ee0342 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/map/MapViewWithLifecycle.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/map/MapViewWithLifecycle.kt
@@ -30,9 +30,9 @@ import androidx.compose.runtime.saveable.Saver
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.platform.LocalContext
-import androidx.lifecycle.compose.LocalLifecycleOwner
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleEventObserver
+import androidx.lifecycle.compose.LocalLifecycleOwner
 import com.geeksville.mesh.BuildConfig
 import com.geeksville.mesh.android.BuildUtils.errormsg
 import com.geeksville.mesh.util.requiredZoomLevel
@@ -67,13 +67,18 @@ const val MAP_STYLE_ID = "map_style_id"
 
 private const val MinZoomLevel = 1.5
 private const val MaxZoomLevel = 20.0
+private const val DefaultZoomLevel = 15.0
 
 @Composable
 internal fun rememberMapViewWithLifecycle(
     box: BoundingBox,
     tileSource: ITileSource = TileSourceFactory.DEFAULT_TILE_SOURCE,
 ): MapView {
-    val zoom = box.requiredZoomLevel()
+    val zoom = if (box.requiredZoomLevel().isFinite()) {
+        box.requiredZoomLevel()
+    } else {
+        DefaultZoomLevel
+    }
     val center = GeoPoint(box.centerLatitude, box.centerLongitude)
     return rememberMapViewWithLifecycle(zoom, center, tileSource)
 }
@@ -108,7 +113,7 @@ internal fun rememberMapViewWithLifecycle(
             minZoomLevel = MinZoomLevel
             maxZoomLevel = MaxZoomLevel
             // Disables default +/- button for zooming
-            zoomController.setVisibility(CustomZoomButtonsController.Visibility.NEVER)
+            zoomController.setVisibility(CustomZoomButtonsController.Visibility.SHOW_AND_FADEOUT)
 
             controller.setZoom(savedZoom)
             controller.setCenter(savedCenter)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index cdf27ac53..6ce48b755 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -36,7 +36,7 @@ navigation = "2.9.0"
 okhttp = "4.12.0"
 org-eclipse-paho-client-mqttv3 = "1.2.5"
 osmbonuspack = "6.9.0"
-osmdroid-android = "6.1.14"
+osmdroid-android = "6.1.20"
 protobuf-gradle-plugin = "0.9.5"
 protobuf-kotlin = "4.31.0"
 retrofit = "3.0.0"