diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListView.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListView.kt
index 53f15066b6..9f3b2afd2a 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListView.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListView.kt
@@ -289,7 +289,11 @@ private fun MessageSummary(
         is TimelineItemRedactedContent,
         is TimelineItemUnknownContent -> content = { ContentForBody(textContent) }
         is TimelineItemLocationContent -> {
-            content = { ContentForBody(stringResource(CommonStrings.common_shared_location)) }
+            val body = when(event.content.mode) {
+                is TimelineItemLocationContent.Mode.Live -> stringResource(CommonStrings.common_shared_live_location)
+                is TimelineItemLocationContent.Mode.Static -> stringResource(CommonStrings.common_shared_location)
+            }
+            content = { ContentForBody(body) }
         }
         is TimelineItemImageContent -> {
             content = { ContentForBody(event.content.bestDescription) }
diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/utils/messagesummary/DefaultMessageSummaryFormatter.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/utils/messagesummary/DefaultMessageSummaryFormatter.kt
index 0aeb3bb8fc..a92dedae0f 100644
--- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/utils/messagesummary/DefaultMessageSummaryFormatter.kt
+++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/utils/messagesummary/DefaultMessageSummaryFormatter.kt
@@ -41,7 +41,10 @@ class DefaultMessageSummaryFormatter(
             is TimelineItemTextBasedContent -> content.plainText
             is TimelineItemProfileChangeContent -> content.body
             is TimelineItemStateContent -> content.body
-            is TimelineItemLocationContent -> context.getString(CommonStrings.common_shared_location)
+            is TimelineItemLocationContent -> when(content.mode) {
+                is TimelineItemLocationContent.Mode.Live -> context.getString(CommonStrings.common_shared_live_location)
+                is TimelineItemLocationContent.Mode.Static -> context.getString(CommonStrings.common_shared_location)
+            }
             is TimelineItemEncryptedContent -> context.getString(CommonStrings.common_unable_to_decrypt)
             is TimelineItemRedactedContent -> context.getString(CommonStrings.common_message_removed)
             is TimelineItemPollContent -> content.question
diff --git a/libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/DefaultRoomLatestEventFormatter.kt b/libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/DefaultRoomLatestEventFormatter.kt
index 68dd4cd332..3ecd7819e5 100644
--- a/libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/DefaultRoomLatestEventFormatter.kt
+++ b/libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/DefaultRoomLatestEventFormatter.kt
@@ -117,7 +117,7 @@ class DefaultRoomLatestEventFormatter(
                 message.prefixIfNeeded(senderDisambiguatedDisplayName, isDmRoom, isOutgoing)
             }
             is LiveLocationContent -> {
-                val message = sp.getString(CommonStrings.common_shared_location)
+                val message = sp.getString(CommonStrings.common_shared_live_location)
                 message.prefixIfNeeded(senderDisambiguatedDisplayName, isDmRoom, isOutgoing)
             }
             is LegacyCallInviteContent -> sp.getString(CommonStrings.common_unsupported_call)