diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
index 1725759307..4902cc047f 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
@@ -189,9 +189,9 @@ class MessageInformationDataFactory @Inject constructor(
     }
 
     private fun getSenderId(event: TimelineEvent) = if (event.isEncrypted()) {
-        event.root.toValidDecryptedEvent()?.let {
+        event.root.senderId ?: event.root.toValidDecryptedEvent()?.let {
             session.cryptoService().deviceWithIdentityKey(it.cryptoSenderKey, it.algorithm)?.userId
-        } ?: event.root.senderId.orEmpty()
+        }.orEmpty()
     } else {
         event.root.senderId.orEmpty()
     }