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 2f5b2eb107..ffe15e2745 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
@@ -54,7 +54,7 @@ abstract class MessageTextItem : AbsMessageItem<MessageTextItem.Holder>() {
             message?.findPillsAndProcess(coroutineScope) { it.bind(holder.messageView) }
         }
         var m = message
-        if (m != null) {
+        if (m != null && m.isNotEmpty()) {
             // Remove last trailing newline: looks especially bad in message bubble
             if (m.last() == '\n') {
                 m = m.subSequence(0, m.length-1)