diff --git a/Meshtastic/Helpers/Map/OfflineTileManager.swift b/Meshtastic/Helpers/Map/OfflineTileManager.swift
index 235ef0b7..709517c2 100644
--- a/Meshtastic/Helpers/Map/OfflineTileManager.swift
+++ b/Meshtastic/Helpers/Map/OfflineTileManager.swift
@@ -110,7 +110,7 @@ class OfflineTileManager: ObservableObject {
 		if fileManager.fileExists(atPath: tilesUrl.path) {
 			return tilesUrl
 		} else {
-			if UserDefaults.enableOfflineMaps { // Get and persist newTile
+			if UserDefaults.enableOfflineMaps, UserDefaults.mapTileServer.zoomRange.contains(path.z) { // Get and persist newTile
 				return persistLocally(path: path)
 			} else { // Else display empty tile (transparent over Maps tiles)
 				return Bundle.main.url(forResource: "alpha", withExtension: "png")!
@@ -148,8 +148,9 @@ class OfflineTileManager: ObservableObject {
 			try data.write(to: filename)
 		} catch {
 			print("💀 Save Tile Error = \(error)")
+			return url
 		}
-		return url
+		return filename
 	}
 	private func filterTilesAlreadyExisting(paths: [MKTileOverlayPath]) -> [MKTileOverlayPath] {
 		paths.filter {
diff --git a/Meshtastic/Views/Nodes/NodeMap.swift b/Meshtastic/Views/Nodes/NodeMap.swift
index 96697ddf..d5ce3676 100644
--- a/Meshtastic/Views/Nodes/NodeMap.swift
+++ b/Meshtastic/Views/Nodes/NodeMap.swift
@@ -223,7 +223,7 @@ struct NodeMap: View {
 					.padding(.bottom)
 					#endif
 				}
-				.presentationDetents([UserDefaults.enableOfflineMaps || UserDefaults.enableOverlayServer ? .large : .medium])
+				.presentationDetents([enableOfflineMaps || enableOverlayServer ? .large : .medium])
 				.presentationDragIndicator(.visible)
 			}
 		}