diff --git a/vector/src/main/java/im/vector/app/features/location/UrlMapProvider.kt b/vector/src/main/java/im/vector/app/features/location/UrlMapProvider.kt
index adb5c27a02..3e4e16861e 100644
--- a/vector/src/main/java/im/vector/app/features/location/UrlMapProvider.kt
+++ b/vector/src/main/java/im/vector/app/features/location/UrlMapProvider.kt
@@ -39,7 +39,7 @@ class UrlMapProvider @Inject constructor(
 
     suspend fun getMapUrl(): String {
         val upstreamMapUrl = tryOrNull { rawService.getElementWellknown(session.sessionParams) }
-                ?.mapTileServerConfig
+                ?.getBestMapTileServerConfig()
                 ?.mapStyleUrl
         return upstreamMapUrl ?: fallbackMapUrl
     }
diff --git a/vector/src/main/java/im/vector/app/features/raw/wellknown/ElementWellKnown.kt b/vector/src/main/java/im/vector/app/features/raw/wellknown/ElementWellKnown.kt
index b1f1f6b1e0..91b0f4d2f7 100644
--- a/vector/src/main/java/im/vector/app/features/raw/wellknown/ElementWellKnown.kt
+++ b/vector/src/main/java/im/vector/app/features/raw/wellknown/ElementWellKnown.kt
@@ -41,12 +41,9 @@ data class ElementWellKnown(
         val unstableMapTileServerConfig: MapTileServerConfig? = null,
 
         @Json(name = "m.tile_server")
-        val stableMapTileServerConfig: MapTileServerConfig? = null
+        val mapTileServerConfig: MapTileServerConfig? = null
 ) {
-
-    @Transient
-    var mapTileServerConfig: MapTileServerConfig? = null
-    get() = stableMapTileServerConfig ?: unstableMapTileServerConfig
+    fun getBestMapTileServerConfig() = mapTileServerConfig ?: unstableMapTileServerConfig
 }
 
 @JsonClass(generateAdapter = true)