diff --git a/changelog.d/8471.bugfix b/changelog.d/8471.bugfix
new file mode 100644
index 0000000000..ff0b0f5493
--- /dev/null
+++ b/changelog.d/8471.bugfix
@@ -0,0 +1 @@
+The correct title and options are now displayed When a poll that was edited is ended.
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 09b91cc4f1..85e4db4091 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
@@ -286,7 +286,10 @@ class MessageItemFactory @Inject constructor(
         } else {
             null
         }
-        val pollContent = pollStartEvent?.root?.getClearContent()?.toModel<MessagePollContent>()
+
+        val editedContent = pollStartEvent?.annotations?.editSummary?.latestEdit?.getClearContent()?.toModel<MessagePollContent>()?.newContent
+        val latestContent = editedContent ?: pollStartEvent?.root?.getClearContent()
+        val pollContent = latestContent?.toModel<MessagePollContent>()
 
         return if (pollContent == null) {
             val title = stringProvider.getString(R.string.message_reply_to_ended_poll_preview).toEpoxyCharSequence()