diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageTextItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageTextItem.kt
index afd239883b..6c76b1584d 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageTextItem.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageTextItem.kt
@@ -122,6 +122,8 @@ abstract class MessageTextItem : AbsMessageItem<MessageTextItem.Holder>() {
         if (canUseTextFuture) {
             holder.messageView.setTextFuture(textFuture)
         } else {
+            // Remove possible previously set futures that might overwrite our text
+            holder.messageView.setTextFuture(null)
             holder.messageView.text = message
         }
     }