diff --git a/app/src/main/kotlin/com/wire/android/ui/home/conversations/messages/ConversationMessagesViewModel.kt b/app/src/main/kotlin/com/wire/android/ui/home/conversations/messages/ConversationMessagesViewModel.kt
index f7d59bedb2..5377c40f8c 100644
--- a/app/src/main/kotlin/com/wire/android/ui/home/conversations/messages/ConversationMessagesViewModel.kt
+++ b/app/src/main/kotlin/com/wire/android/ui/home/conversations/messages/ConversationMessagesViewModel.kt
@@ -201,9 +201,10 @@ class ConversationMessagesViewModel @Inject constructor(
             }
             .distinctUntilChanged()
             .map { messageId ->
-                val senderNameResult = messageId?.let { getSenderNameByMessageId(conversationId, it) }
-                val senderName = if (senderNameResult is GetSenderNameByMessageIdUseCase.Result.Success) senderNameResult.name
-                else null
+                val senderName = messageId?.let {
+                    val result = getSenderNameByMessageId(conversationId, it)
+                    if (result is GetSenderNameByMessageIdUseCase.Result.Success) result.name else null
+                }
 
                 messageId to senderName
             }
diff --git a/kalium b/kalium
index 9e38f7d841..b4b66eb70a 160000
--- a/kalium
+++ b/kalium
@@ -1 +1 @@
-Subproject commit 9e38f7d84108797c36171b621eb716bc51bbe707
+Subproject commit b4b66eb70a59f7f1c8178d75498d14a2cc4a0db8