diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/timeline/TimelineEvent.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/timeline/TimelineEvent.kt
index 58cc8eca..c05bd138 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/timeline/TimelineEvent.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/room/timeline/TimelineEvent.kt
@@ -56,13 +56,13 @@ data class TimelineEvent(
 
     fun getDisambiguatedDisplayName(): String {
         return if (isUniqueDisplayName) {
-            senderName ?: root.senderId
+            senderName
         } else {
-            senderName?.let {
-                it + " (" + root.senderId + ")"
+            senderName?.let { name ->
+                "$name (${root.senderId})"
             }
-                    ?: root.senderId
         }
+                ?: root.senderId
                 ?: ""
     }