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 1d6586c266..642b13a6fe 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
@@ -731,6 +731,7 @@ internal class LocalEchoEventFactory @Inject constructor(
                 localEchoRepository
                         .getRelatedPollEvent(timelineEvent)
                         ?.getLastMessageContent()
+                        ?: timelineEvent.getLastMessageContent()
             }
             else -> timelineEvent.getLastMessageContent()
         }