diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageEndPollContent.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageEndPollContent.kt
index 6e31320b13..ba24aab00e 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageEndPollContent.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/model/message/MessageEndPollContent.kt
@@ -33,5 +33,11 @@ data class MessageEndPollContent(
         override val msgType: String = MessageType.MSGTYPE_POLL_END,
         @Json(name = "body") override val body: String = "",
         @Json(name = "m.new_content") override val newContent: Content? = null,
-        @Json(name = "m.relates_to") override val relatesTo: RelationDefaultContent? = null
-) : MessageContent
+        @Json(name = "m.relates_to") override val relatesTo: RelationDefaultContent? = null,
+        @Json(name = "org.matrix.msc1767.text") val unstableText: String? = null,
+        @Json(name = "m.text") val text: String? = null,
+) : MessageContent {
+    fun getBestText() = text ?: unstableText
+}
+
+
diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt
index b5114ec1dd..c2bdec3596 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt
@@ -242,7 +242,8 @@ internal class LocalEchoEventFactory @Inject constructor(
                 relatesTo = RelationDefaultContent(
                         type = RelationType.REFERENCE,
                         eventId = eventId
-                )
+                ),
+                unstableText = "Ended poll",
         )
         val localId = LocalEcho.createLocalEchoId()
         return Event(