diff --git a/changelog.d/5340.bugfix b/changelog.d/5340.bugfix
index 17fd9716c0..4c53f0088c 100644
--- a/changelog.d/5340.bugfix
+++ b/changelog.d/5340.bugfix
@@ -1 +1 @@
-Support both stable and unstable prefixes
\ No newline at end of file
+Support both stable and unstable prefixes for Events about Polls and Location
\ No newline at end of file
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
index 81a8150c95..b99dbcc220 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
@@ -211,8 +211,8 @@ class MessageActionsViewModel @AssistedInject constructor(@Assisted
                         noticeEventFormatter.format(timelineEvent, room?.roomSummary()?.isDirect.orFalse())
                     }
                     in EventType.POLL_START -> {
-                        timelineEvent.root.getClearContent().toModel<MessagePollContent>(catchError = true)?.getBestPollCreationInfo()?.question?.getBestQuestion()
-                                ?: ""
+                        timelineEvent.root.getClearContent().toModel<MessagePollContent>(catchError = true)
+                                ?.getBestPollCreationInfo()?.question?.getBestQuestion() ?: ""
                     }
                     else                    -> null
                 }