diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageLocationContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageLocationContent.kt
index bf51e7177b..c090487c58 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageLocationContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageLocationContent.kt
@@ -63,5 +63,5 @@ data class MessageLocationContent(
         @Json(name = "org.matrix.msc1767.text") val text: String? = null
 ) : MessageContent {
 
-    fun getUri() = locationInfo?.geoUri ?: geoUri
+    fun getBestGeoUri() = locationInfo?.geoUri ?: geoUri
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
index 7e2bb835e0..8db3bc2fa8 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
@@ -614,7 +614,7 @@ class RoomDetailFragment @Inject constructor(
 
     private fun handleShowLocationPreview(locationContent: MessageLocationContent, senderId: String) {
                 // TODO Create a helper
-        val geoUri = locationContent.getUri()
+        val geoUri = locationContent.getBestGeoUri()
         val locationData = LocationData.create(geoUri)
         navigator
                 .openLocationSharing(
@@ -1948,7 +1948,7 @@ class RoomDetailFragment @Inject constructor(
         when (action.messageContent) {
             is MessageTextContent           -> shareText(requireContext(), action.messageContent.body)
             is MessageLocationContent       -> {
-                LocationData.create(action.messageContent.getUri())?.let {
+                LocationData.create(action.messageContent.getBestGeoUri())?.let {
                     openLocation(requireActivity(), it.latitude, it.longitude)
                 }
             }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsEpoxyController.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsEpoxyController.kt
index 59e54f17ab..14f56a7846 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsEpoxyController.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsEpoxyController.kt
@@ -79,7 +79,7 @@ class MessageActionsEpoxyController @Inject constructor(
         val bindingOptions = spanUtils.getBindingOptions(body)
         val locationUrl = state.timelineEvent()?.root?.getClearContent()
                 ?.toModel<MessageLocationContent>(catchError = true)
-                ?.let { LocationData.create(it.getUri()) }
+                ?.let { LocationData.create(it.getBestGeoUri()) }
                 ?.let { urlMapProvider.buildStaticMapUrl(it, INITIAL_MAP_ZOOM_IN_TIMELINE, 1200, 800) }
 
         bottomSheetMessagePreviewItem {
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
index 0b0373a889..8f88be0683 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MessageItemFactory.kt
@@ -200,7 +200,7 @@ class MessageItemFactory @Inject constructor(
                                   informationData: MessageInformationData,
                                   highlight: Boolean,
                                   attributes: AbsMessageItem.Attributes): MessageLocationItem? {
-        val geoUri = locationContent.getUri()
+        val geoUri = locationContent.getBestGeoUri()
         val locationData = LocationData.create(geoUri)
 
         val width = resources.displayMetrics.widthPixels - dimensionConverter.dpToPx(60)