diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatView.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatView.kt
index eacfb37e87..f4a8f3f182 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatView.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/chat/ChatView.kt
@@ -536,14 +536,16 @@ fun ChatView(
                 val stats = r?.second
                 val (updatedMember, code) = if ((member.memberActive || (groupInfo.useRelays && member.memberCurrent)) && member.memberRole != GroupMemberRole.Relay) {
                   val memCode = chatModel.controller.apiGetGroupMemberCode(chatRh, groupInfo.apiId, member.groupMemberId)
-                  (memCode?.first ?: r?.first ?: member) to memCode?.second
+                  (memCode?.first ?: r?.first) to memCode?.second
                 } else {
-                  (r?.first ?: member) to null
+                  r?.first to null
                 }
                 if (!isActive || chatModel.chatId.value != groupInfo.id) return@launch
                 // members are not loaded in large groups, so only the opened member is added to the model
-                withContext(Dispatchers.Main) {
-                  chatModel.chatsContext.upsertGroupMember(chatRh, groupInfo, updatedMember)
+                if (updatedMember != null) {
+                  withContext(Dispatchers.Main) {
+                    chatModel.chatsContext.upsertGroupMember(chatRh, groupInfo, updatedMember)
+                  }
                 }
                 connStats.value = stats
                 connectionCode.value = code