diff --git a/core/preferences/src/main/java/de/mm20/launcher2/preferences/search/LocationSearchSettings.kt b/core/preferences/src/main/java/de/mm20/launcher2/preferences/search/LocationSearchSettings.kt
index 331c99bc..277afca7 100644
--- a/core/preferences/src/main/java/de/mm20/launcher2/preferences/search/LocationSearchSettings.kt
+++ b/core/preferences/src/main/java/de/mm20/launcher2/preferences/search/LocationSearchSettings.kt
@@ -74,7 +74,9 @@ class LocationSearchSettings internal constructor(
 
     fun setOverpassUrl(overpassUrl: String?) {
         var url = overpassUrl
-        if (url != null) {
+        if (url.isNullOrBlank()) {
+            url = DefaultOverpassUrl
+        } else {
             if (!url.startsWith("http://") && !url.startsWith("https://")) {
                 url = "https://$url"
             }
@@ -95,7 +97,9 @@ class LocationSearchSettings internal constructor(
 
     fun setTileServer(tileServer: String?) {
         var url = tileServer
-        if (url != null) {
+        if (url.isNullOrBlank()) {
+            url = DefaultTileServerUrl
+        } else {
             if (!url.startsWith("http://") && !url.startsWith("https://")) {
                 url = "https://$url"
             }
@@ -136,8 +140,8 @@ class LocationSearchSettings internal constructor(
     }
 
     companion object {
-        const val DefaultTileServerUrl = "https://tile.openstreetmap.org"
-        const val DefaultOverpassUrl = "https://overpass-api.de/"
+        const val DefaultTileServerUrl = "https://tile.openstreetmap.org/\${z}/\${x}/\${y}.png"
+        const val DefaultOverpassUrl = "https://overpass-api.de"
     }
 
 }