diff --git a/src/app/modules/main/chat_section/chat_content/chat_details.nim b/src/app/modules/main/chat_section/chat_content/chat_details.nim
index 6534cee2ec..f1f454e69b 100644
--- a/src/app/modules/main/chat_section/chat_content/chat_details.nim
+++ b/src/app/modules/main/chat_section/chat_content/chat_details.nim
@@ -354,7 +354,7 @@ QtObject:
     self.missingEncryptionKeyChanged()
 
   proc requiresPermissionsChanged(self: ChatDetails) {.signal.}
-  proc getRequiresPermissions*(self: ChatDetails): bool {.slot.} =
+  proc getRequiresPermissions(self: ChatDetails): bool {.slot.} =
     return self.requiresPermissions
   QtProperty[bool] requiresPermissions:
     read = getRequiresPermissions
diff --git a/src/app/modules/main/chat_section/chat_content/module.nim b/src/app/modules/main/chat_section/chat_content/module.nim
index 16a7ff5a71..fc8f72a054 100644
--- a/src/app/modules/main/chat_section/chat_content/module.nim
+++ b/src/app/modules/main/chat_section/chat_content/module.nim
@@ -401,11 +401,7 @@ method onCommunityChannelEdited*(self: Module, chatDto: ChatDto) =
   self.view.chatDetails.setName(chatDto.name)
   self.view.chatDetails.setIcon(chatDto.icon)
   self.view.chatDetails.setMissingEncryptionKey(chatDto.missingEncryptionKey)
-
-  if self.view.chatDetails.getRequiresPermissions() != chatDto.tokenGated:
-    # The channel permission status changed. Update the member list
-    self.view.chatDetails.setRequiresPermissions(chatDto.tokenGated)
-    self.usersModule.updateMembersList()
+  self.view.chatDetails.setRequiresPermissions(chatDto.tokenGated)
 
   self.messagesModule.updateChatFetchMoreMessages()
   self.messagesModule.updateChatIdentifier()
diff --git a/src/app/modules/main/chat_section/chat_content/users/controller.nim b/src/app/modules/main/chat_section/chat_content/users/controller.nim
index 5f893807e1..906ceaa858 100644
--- a/src/app/modules/main/chat_section/chat_content/users/controller.nim
+++ b/src/app/modules/main/chat_section/chat_content/users/controller.nim
@@ -21,6 +21,9 @@ type
     communityService: community_service.Service
     messageService: message_service.Service
 
+# Forward declaration
+proc getChat*(self: Controller): ChatDto
+
 proc newController*(
   delegate: io_interface.AccessInterface, events: EventEmitter, sectionId: string, chatId: string,
   belongsToCommunity: bool, isUsersListAvailable: bool, contactService: contact_service.Service,
@@ -60,7 +63,7 @@ proc init*(self: Controller) =
     self.delegate.loggedInUserImageChanged()
 
   # Events only for the user list, so not needed in one to one chats
-  if self.isUsersListAvailable:
+  if(self.isUsersListAvailable):
     self.events.on(SIGNAL_CONTACT_UNTRUSTWORTHY) do(e: Args):
       var args = TrustArgs(e)
       self.delegate.contactUpdated(args.publicKey)
@@ -115,12 +118,20 @@ proc belongsToCommunity*(self: Controller): bool =
 proc getMyCommunity*(self: Controller): CommunityDto =
   return self.communityService.getCommunityById(self.sectionId)
 
-proc getMyChatId*(self: Controller): string =
-  return self.chatId
-
-proc getMyChat*(self: Controller): ChatDto =
+proc getChat*(self: Controller): ChatDto =
   return self.chatService.getChatById(self.chatId)
 
+proc getChatMembers*(self: Controller): seq[ChatMember] =
+  if self.belongsToCommunity:
+    let myCommunity = self.getMyCommunity()
+    # TODO: when a new channel is added, chat may arrive earlier and we have no up to date community yet
+    # see log here: https://github.com/status-im/status-desktop/issues/14442#issuecomment-2120756598
+    # should be resolved in https://github.com/status-im/status-desktop/issues/14219
+    let members = myCommunity.getCommunityChat(self.chatId).members
+    if members.len > 0:
+      return members
+  return self.chatService.getChatById(self.chatId).members
+
 proc getContactNameAndImage*(self: Controller, contactId: string):
     tuple[name: string, image: string, largeImage: string] =
   return self.contactService.getContactNameAndImage(contactId)
diff --git a/src/app/modules/main/chat_section/chat_content/users/io_interface.nim b/src/app/modules/main/chat_section/chat_content/users/io_interface.nim
index ed47348666..bce4b8c36b 100644
--- a/src/app/modules/main/chat_section/chat_content/users/io_interface.nim
+++ b/src/app/modules/main/chat_section/chat_content/users/io_interface.nim
@@ -20,9 +20,6 @@ method isLoaded*(self: AccessInterface): bool {.base.} =
 method getModuleAsVariant*(self: AccessInterface): QVariant {.base.} =
   raise newException(ValueError, "No implementation available")
 
-method getUsersListVariant*(self: AccessInterface): QVariant {.base.} =
-  raise newException(ValueError, "No implementation available")
-
 method onNewMessagesLoaded*(self: AccessInterface, messages: seq[MessageDto]) {.base.} =
   raise newException(ValueError, "No implementation available")
 
@@ -62,5 +59,5 @@ method addGroupMembers*(self: AccessInterface, pubKeys: seq[string]) {.base.} =
 method removeGroupMembers*(self: AccessInterface, pubKeys: seq[string]) {.base.} =
   raise newException(ValueError, "No implementation available")
 
-method updateMembersList*(self: AccessInterface, membersToReset: seq[ChatMember] = @[]) {.base.} =
+method updateMembersList*(self: AccessInterface) {.base.} =
   raise newException(ValueError, "No implementation available")
\ No newline at end of file
diff --git a/src/app/modules/main/chat_section/chat_content/users/module.nim b/src/app/modules/main/chat_section/chat_content/users/module.nim
index 5f70a87022..557f25fbe6 100644
--- a/src/app/modules/main/chat_section/chat_content/users/module.nim
+++ b/src/app/modules/main/chat_section/chat_content/users/module.nim
@@ -4,13 +4,13 @@ import view, controller
 import ../../../../shared_models/[member_model, member_item]
 import ../../../../../global/global_singleton
 import ../../../../../core/eventemitter
+import ../../../../../../app_service/common/conversion
 import ../../../../../../app_service/common/types
 import ../../../../../../app_service/service/contacts/dto/contacts
 import ../../../../../../app_service/service/contacts/service as contact_service
 import ../../../../../../app_service/service/chat/service as chat_service
 import ../../../../../../app_service/service/community/service as community_service
 import ../../../../../../app_service/service/message/service as message_service
-from ../../../../../../app_service/common/conversion import intToEnum
 
 export io_interface
 
@@ -20,17 +20,15 @@ type
     viewVariant: QVariant
     controller: Controller
     moduleLoaded: bool
-    isPublicCommunityChannel: bool
-    isSectionMemberList: bool
 
 # Forward declaration
-proc processChatMember(self: Module,  member: ChatMember, reset: bool = false): tuple[doAdd: bool, memberItem: MemberItem]
+proc processChatMember(self: Module,  member: ChatMember): MemberItem
 
 proc newModule*(
   events: EventEmitter, sectionId: string, chatId: string,
   belongsToCommunity: bool, isUsersListAvailable: bool, contactService: contact_service.Service,
   chatService: chat_service.Service, communityService: community_service.Service,
-  messageService: message_service.Service, isSectionMemberList: bool = false,
+  messageService: message_service.Service,
 ): Module =
   result = Module()
   result.view = view.newView(result)
@@ -40,8 +38,6 @@ proc newModule*(
     contactService, chatService, communityService, messageService,
   )
   result.moduleLoaded = false
-  result.isPublicCommunityChannel = false
-  result.isSectionMemberList = isSectionMemberList
 
 method delete*(self: Module) =
   self.controller.delete
@@ -63,12 +59,7 @@ method viewDidLoad*(self: Module) =
 method getModuleAsVariant*(self: Module): QVariant =
   return self.viewVariant
 
-method getUsersListVariant*(self: Module): QVariant =
-  self.view.getModel()
-
 method contactNicknameChanged*(self: Module, publicKey: string) =
-  if self.isPublicCommunityChannel:
-    return
   let contactDetails = self.controller.getContactDetails(publicKey)
   self.view.model().setName(
     publicKey,
@@ -78,15 +69,11 @@ method contactNicknameChanged*(self: Module, publicKey: string) =
     )
 
 method contactsStatusUpdated*(self: Module, statusUpdates: seq[StatusUpdateDto]) =
-  if self.isPublicCommunityChannel:
-    return
   for s in statusUpdates:
     var status = toOnlineStatus(s.statusType)
     self.view.model().setOnlineStatus(s.publicKey, status)
 
 method contactUpdated*(self: Module, publicKey: string) =
-  if self.isPublicCommunityChannel:
-    return
   let contactDetails = self.controller.getContactDetails(publicKey)
   let isMe = publicKey == singletonInstance.userProfile.getPubKey()
   self.view.model().updateItem(
@@ -103,43 +90,37 @@ method contactUpdated*(self: Module, publicKey: string) =
   )
 
 method userProfileUpdated*(self: Module) =
-  if self.isPublicCommunityChannel:
-    return
   self.contactUpdated(singletonInstance.userProfile.getPubKey())
 
 method loggedInUserImageChanged*(self: Module) =
-  if self.isPublicCommunityChannel:
-    return
   self.view.model().setIcon(singletonInstance.userProfile.getPubKey(), singletonInstance.userProfile.getIcon())
 
 # This function either removes the member if it is no longer part of the community,
 # does nothing if the member is already in the model or creates the MemberItem
-proc processChatMember(self: Module,  member: ChatMember, reset: bool = false): tuple[doAdd: bool, memberItem: MemberItem] =
-  result.doAdd = false
+proc processChatMember(self: Module,  member: ChatMember): MemberItem =
   if member.id == "":
     return
 
-  if not reset and not self.controller.belongsToCommunity() and not member.joined:
+  if not self.controller.belongsToCommunity() and not member.joined:
     if self.view.model().isContactWithIdAdded(member.id):
       # Member is no longer joined
       self.view.model().removeItemById(member.id)
     return
 
-  if not reset and self.view.model().isContactWithIdAdded(member.id):
+  if self.view.model().isContactWithIdAdded(member.id):
     return
 
   let isMe = member.id == singletonInstance.userProfile.getPubKey()
   let contactDetails = self.controller.getContactDetails(member.id)
   var status = OnlineStatus.Online
-  if isMe:
+  if (isMe):
     let currentUserStatus = intToEnum(singletonInstance.userProfile.getCurrentUserStatus(), StatusType.Unknown)
     status = toOnlineStatus(currentUserStatus)
   else:
     let statusUpdateDto = self.controller.getStatusForContact(member.id)
     status = toOnlineStatus(statusUpdateDto.statusType)
 
-  result.doAdd = true
-  result.memberItem = initMemberItem(
+  return initMemberItem(
     pubKey = member.id,
     displayName = contactDetails.dto.displayName,
     ensName = contactDetails.dto.name,
@@ -155,45 +136,38 @@ proc processChatMember(self: Module,  member: ChatMember, reset: bool = false):
     memberRole = member.role,
     joined = member.joined,
     isUntrustworthy = contactDetails.dto.trustStatus == TrustStatus.Untrustworthy,
-  )
+    )
 
 method onChatMembersAdded*(self: Module, ids: seq[string]) =
-  if self.isPublicCommunityChannel:
-    return
   var memberItems: seq[MemberItem] = @[]
 
   for memberId in ids:
-    let (doAdd, item) = self.processChatMember(ChatMember(id: memberId, role: MemberRole.None, joined: true))
-    if doAdd:
+    let item = self.processChatMember(ChatMember(id: memberId, role: MemberRole.None, joined: true))
+    if item.pubKey != "":
       memberItems.add(item)
 
   self.view.model().addItems(memberItems)
 
 method onChatMemberRemoved*(self: Module, id: string) =
-  if self.isPublicCommunityChannel:
-    return
   self.view.model().removeItemById(id)
 
 method onMembersChanged*(self: Module,  members: seq[ChatMember]) =
-  if self.isPublicCommunityChannel:
-    return
   let modelIDs = self.view.model().getItemIds()
   let membersAdded = filter(members, member => not modelIDs.contains(member.id))
   let membersRemoved = filter(modelIDs, id => not members.any(member => member.id == id))
 
   var memberItems: seq[MemberItem] = @[]
   for member in membersAdded:
-    let (doAdd, item) = self.processChatMember(member)
-    if doAdd:
+    let item = self.processChatMember(member)
+    if item.pubKey != "":
       memberItems.add(item)
   self.view.model().addItems(memberItems)
 
   for id in membersRemoved:
     self.onChatMemberRemoved(id)
 
+
 method onChatMemberUpdated*(self: Module, publicKey: string, memberRole: MemberRole, joined: bool) =
-  if self.isPublicCommunityChannel:
-    return
   let contactDetails = self.controller.getContactDetails(publicKey)
   let isMe = publicKey == singletonInstance.userProfile.getPubKey()
   self.view.model().updateItem(
@@ -217,45 +191,13 @@ method addGroupMembers*(self: Module, pubKeys: seq[string]) =
 method removeGroupMembers*(self: Module, pubKeys: seq[string]) =
   self.controller.removeGroupMembers(pubKeys)
 
-method updateMembersList*(self: Module, membersToReset: seq[ChatMember] = @[]) =
-  let reset = membersToReset.len > 0
-  var members: seq[ChatMember]
-  if reset:
-    members = membersToReset
-  else:
-    if self.controller.belongsToCommunity():
-      let myCommunity = self.controller.getMyCommunity()
-
-      if self.isSectionMemberList:
-        members = myCommunity.members
-      else:
-        # TODO: when a new channel is added, chat may arrive earlier and we have no up to date community yet
-        # see log here: https://github.com/status-im/status-desktop/issues/14442#issuecomment-2120756598
-        # should be resolved in https://github.com/status-im/status-desktop/issues/11694
-        let myChatId = self.controller.getMyChatId()
-        let chat = myCommunity.getCommunityChat(myChatId)
-        if not chat.tokenGated:
-          # No need to get the members, this channel is not encrypted and can use the section member list
-          self.isPublicCommunityChannel = true
-          return
-        self.isPublicCommunityChannel = false
-        if chat.members.len > 0:
-          members = chat.members
-        else:
-          # The channel now has a permisison, but the re-eval wasn't performed yet. Show all members for now
-          members = myCommunity.members
-
-    if members.len == 0:
-      members = self.controller.getMyChat().members
-
+method updateMembersList*(self: Module) =
+  let members = self.controller.getChatMembers()
   var memberItems: seq[MemberItem] = @[]
 
   for member in members:
-    let (doAdd, item) = self.processChatMember(member, reset)
-    if doAdd:
+    let item = self.processChatMember(member)
+    if item.pubKey != "":
       memberItems.add(item)
 
-  if reset:
-    self.view.model().setItems(memberItems)
-  else:
-    self.view.model().addItems(memberItems)
+  self.view.model().addItems(memberItems)
diff --git a/src/app/modules/main/chat_section/chat_content/users/view.nim b/src/app/modules/main/chat_section/chat_content/users/view.nim
index 3f83dab687..0b1e5d1501 100644
--- a/src/app/modules/main/chat_section/chat_content/users/view.nim
+++ b/src/app/modules/main/chat_section/chat_content/users/view.nim
@@ -33,10 +33,10 @@ QtObject:
 
   proc modelChanged*(self: View) {.signal.}
 
-  proc getModel*(self: View): QVariant {.slot.} =
+  proc getModel(self: View): QVariant {.slot.} =
     return self.modelVariant
 
-  QtProperty[QVariant] model:
+  QtProperty[QVariant]model:
     read = getModel
     notify = modelChanged
 
diff --git a/src/app/modules/main/chat_section/controller.nim b/src/app/modules/main/chat_section/controller.nim
index d264d56f8c..3ed2bb12e6 100644
--- a/src/app/modules/main/chat_section/controller.nim
+++ b/src/app/modules/main/chat_section/controller.nim
@@ -342,11 +342,6 @@ proc init*(self: Controller) =
       if args.communityId == self.sectionId:
         self.delegate.onSectionMutedChanged()
 
-    self.events.on(SIGNAL_COMMUNITY_MEMBERS_CHANGED) do(e: Args):
-      let args = CommunityMembersArgs(e)
-      if args.communityId == self.sectionId:
-        self.delegate.updateCommunityMemberList(args.members)
-
   self.events.on(SIGNAL_CONTACT_NICKNAME_CHANGED) do(e: Args):
     var args = ContactArgs(e)
     self.delegate.onContactDetailsUpdated(args.contactId)
diff --git a/src/app/modules/main/chat_section/io_interface.nim b/src/app/modules/main/chat_section/io_interface.nim
index e1174a0d98..4614faf4d5 100644
--- a/src/app/modules/main/chat_section/io_interface.nim
+++ b/src/app/modules/main/chat_section/io_interface.nim
@@ -46,12 +46,6 @@ method isLoaded*(self: AccessInterface): bool {.base.} =
 method getModuleAsVariant*(self: AccessInterface): QVariant {.base.} =
   raise newException(ValueError, "No implementation available")
 
-method updateCommunityMemberList*(self: AccessInterface, members: seq[ChatMember]) {.base.} =
-  raise newException(ValueError, "No implementation available")
-
-method getSectionMemberList*(self: AccessInterface): QVariant {.base.} =
-  raise newException(ValueError, "No implementation available")
-
 method onActiveSectionChange*(self: AccessInterface, sectionId: string) {.base.} =
   raise newException(ValueError, "No implementation available")
 
diff --git a/src/app/modules/main/chat_section/module.nim b/src/app/modules/main/chat_section/module.nim
index 3d960cda6f..a3a8e22062 100644
--- a/src/app/modules/main/chat_section/module.nim
+++ b/src/app/modules/main/chat_section/module.nim
@@ -17,7 +17,6 @@ import ../../shared_models/token_criteria_model
 import ../../shared_models/token_permission_chat_list_model
 
 import chat_content/module as chat_content_module
-import chat_content/users/module as users_module
 
 import ../../../global/global_singleton
 import ../../../core/eventemitter
@@ -54,7 +53,6 @@ type
     chatContentModules: OrderedTable[string, chat_content_module.AccessInterface]
     moduleLoaded: bool
     chatsLoaded: bool
-    membersListModule: users_module.AccessInterface
 
 # Forward declaration
 proc buildChatSectionUI(
@@ -123,11 +121,6 @@ proc newModule*(
   result.chatsLoaded = false
 
   result.chatContentModules = initOrderedTable[string, chat_content_module.AccessInterface]()
-  if isCommunity:
-    result.membersListModule = users_module.newModule(events, sectionId, chatId = "", isCommunity,
-      isUsersListAvailable = true, contactService, chatService, communityService, messageService, isSectionMemberList = true)
-  else:
-    result.membersListModule = nil
 
 proc currentUserWalletContainsAddress(self: Module, address: string): bool =
   if (address.len == 0):
@@ -225,8 +218,6 @@ method delete*(self: Module) =
   for cModule in self.chatContentModules.values:
     cModule.delete
   self.chatContentModules.clear
-  if self.membersListModule != nil:
-    self.membersListModule.delete
 
 method isCommunity*(self: Module): bool =
   return self.controller.isCommunity()
@@ -449,10 +440,6 @@ method onChatsLoaded*(
   self.buildChatSectionUI(community, chats, events, settingsService, nodeConfigurationService,
     contactService, chatService, communityService, messageService, mailserversService, sharedUrlsService)
 
-  # Generate members list
-  if self.membersListModule != nil:
-    self.membersListModule.load()
-
   if(not self.controller.isCommunity()):
     # we do this only in case of chat section (not in case of communities)
     self.initContactRequestsModel()
@@ -493,12 +480,6 @@ proc checkIfModuleDidLoad(self: Module) =
 method isLoaded*(self: Module): bool =
   return self.moduleLoaded
 
-method getSectionMemberList*(self: Module): QVariant =
-  return self.membersListModule.getUsersListVariant()
-
-method updateCommunityMemberList*(self: Module, members: seq[ChatMember]) =
-  self.membersListModule.updateMembersList(members)
-
 method viewDidLoad*(self: Module) =
   self.checkIfModuleDidLoad()
 
diff --git a/src/app/modules/main/chat_section/view.nim b/src/app/modules/main/chat_section/view.nim
index 85da4e93fe..e526602a89 100644
--- a/src/app/modules/main/chat_section/view.nim
+++ b/src/app/modules/main/chat_section/view.nim
@@ -572,12 +572,4 @@ QtObject:
     if self.communityMemberReevaluationStatus == value:
       return
     self.communityMemberReevaluationStatus = value
-    self.communityMemberReevaluationStatusChanged()
-
-  proc membersModelChanged*(self: View) {.signal.}
-  proc getMembersModel(self: View): QVariant {.slot.} =
-    return self.delegate.getSectionMemberList()
-
-  QtProperty[QVariant] membersModel:
-    read = getMembersModel
-    notify = membersModelChanged
+    self.communityMemberReevaluationStatusChanged()
\ No newline at end of file
diff --git a/src/app_service/service/community/service.nim b/src/app_service/service/community/service.nim
index dd2936a3de..ea8caa206a 100644
--- a/src/app_service/service/community/service.nim
+++ b/src/app_service/service/community/service.nim
@@ -509,7 +509,10 @@ QtObject:
         self.events.emit(SIGNAL_COMMUNITY_CATEGORY_NAME_EDITED,
           CommunityCategoryArgs(communityId: community.id, category: category))
 
-  proc communityTokensChanged(community: CommunityDto, prev_community: CommunityDto): bool =
+    self.events.emit(SIGNAL_COMMUNITY_MEMBERS_CHANGED,
+      CommunityMembersArgs(communityId: community.id, members: community.members))
+
+  proc communityTokensChanged(self: Service, community: CommunityDto, prev_community: CommunityDto): bool =
     let communityTokens = community.communityTokensMetadata
     let prevCommunityTokens = prev_community.communityTokensMetadata
     # checking length is sufficient - communityTokensMetadata list can only extend
@@ -533,17 +536,6 @@ QtObject:
 
       let prevCommunity = self.communities[community.id]
 
-      # If there's settings without `id` it means the original
-      # signal didn't include actual communitySettings, hence we
-      # assign the settings we already have, otherwise we risk our
-      # settings to be overridden with wrong defaults.
-      if community.settings.id == "":
-        community.settings = prevCommunity.settings
-
-      # Save the updated community before calling events, because some events triggers look ups on the new community
-      # We will save again at the end if other properties were updated
-      self.saveUpdatedCommunity(community)
-
       try:
         let currOwner = community.findOwner()
         let prevOwner = prevCommunity.findOwner()
@@ -559,15 +551,23 @@ QtObject:
         let response = tokens_backend.registerLostOwnershipNotification(community.id)
         checkAndEmitACNotificationsFromResponse(self.events, response.result{"activityCenterNotifications"})
 
-      if communityTokensChanged(community, prevCommunity):
+      if self.communityTokensChanged(community, prevCommunity):
         self.events.emit(SIGNAL_COMMUNITY_TOKENS_CHANGED, nil)
 
+      # If there's settings without `id` it means the original
+      # signal didn't include actual communitySettings, hence we
+      # assign the settings we already have, otherwise we risk our
+      # settings to be overridden with wrong defaults.
+      if community.settings.id == "":
+        community.settings = prevCommunity.settings
+
       var deletedCategories: seq[string] = @[]
 
       # category was added
       if(community.categories.len > prevCommunity.categories.len):
         for category in community.categories:
           if findIndexById(category.id, prevCommunity.categories) == -1:
+            self.communities[community.id].categories.add(category)
             let chats = self.getChatsInCategory(community, category.id)
 
             self.events.emit(SIGNAL_COMMUNITY_CATEGORY_CREATED,
@@ -665,12 +665,13 @@ QtObject:
       # members list was changed
       if community.members != prevCommunity.members:
         self.events.emit(SIGNAL_COMMUNITY_MEMBERS_CHANGED,
-          CommunityMembersArgs(communityId: community.id, members: community.members))
+        CommunityMembersArgs(communityId: community.id, members: community.members))
 
       # token metadata was added
       if community.communityTokensMetadata.len > prevCommunity.communityTokensMetadata.len:
         for tokenMetadata in community.communityTokensMetadata:
           if findIndexBySymbol(tokenMetadata.symbol, prevCommunity.communityTokensMetadata) == -1:
+            self.communities[community.id].communityTokensMetadata.add(tokenMetadata)
             self.events.emit(SIGNAL_COMMUNITY_TOKEN_METADATA_ADDED,
                              CommunityTokenMetadataArgs(communityId: community.id,
                                                         tokenMetadata: tokenMetadata))
@@ -679,14 +680,16 @@ QtObject:
       if community.tokenPermissions.len > prevCommunity.tokenPermissions.len:
         for id, tokenPermission in community.tokenPermissions:
           if not prevCommunity.tokenPermissions.hasKey(id):
+            self.communities[community.id].tokenPermissions[id] = tokenPermission
 
             self.events.emit(SIGNAL_COMMUNITY_TOKEN_PERMISSION_CREATED,
-              CommunityTokenPermissionArgs(communityId: community.id, tokenPermission: tokenPermission))
+            CommunityTokenPermissionArgs(communityId: community.id, tokenPermission: tokenPermission))
       elif community.tokenPermissions.len < prevCommunity.tokenPermissions.len:
         for id, prvTokenPermission in prevCommunity.tokenPermissions:
           if not community.tokenPermissions.hasKey(id):
+            self.communities[community.id].tokenPermissions.del(id)
             self.events.emit(SIGNAL_COMMUNITY_TOKEN_PERMISSION_DELETED,
-              CommunityTokenPermissionArgs(communityId: community.id, tokenPermission: prvTokenPermission))
+            CommunityTokenPermissionArgs(communityId: community.id, tokenPermission: prvTokenPermission))
       else:
         for id, tokenPermission in community.tokenPermissions:
           if not prevCommunity.tokenPermissions.hasKey(id):
@@ -722,13 +725,16 @@ QtObject:
                 break
 
           if permissionUpdated:
+            self.communities[community.id].tokenPermissions[id] = tokenPermission
             self.events.emit(SIGNAL_COMMUNITY_TOKEN_PERMISSION_UPDATED,
               CommunityTokenPermissionArgs(communityId: community.id, tokenPermission: tokenPermission))
 
-      let wasJoined = prevCommunity.joined
+      let wasJoined = self.communities[community.id].joined
+
+      self.saveUpdatedCommunity(community)
 
       # If the community was not joined before but is now, we signal it
-      if not wasJoined and community.joined and community.isMember:
+      if(not wasJoined and community.joined and community.isMember):
         self.events.emit(SIGNAL_COMMUNITY_JOINED, CommunityArgs(community: community, fromUserAction: false))
 
       self.events.emit(SIGNAL_COMMUNITIES_UPDATE, CommunitiesArgs(communities: @[community]))
diff --git a/src/app_service/service/contacts/dto/contacts.nim b/src/app_service/service/contacts/dto/contacts.nim
index 3363b75783..e973c02f5d 100644
--- a/src/app_service/service/contacts/dto/contacts.nim
+++ b/src/app_service/service/contacts/dto/contacts.nim
@@ -68,7 +68,7 @@ proc `$`(self: Images): string =
     ]"""
 
 proc `$`*(self: ContactsDto): string =
-  result = fmt"""ContactsDto(
+  result = fmt"""ContactDto(
     id: {self.id},
     name: {self.name},
     ensVerified: {self.ensVerified},
diff --git a/src/app_service/service/ens/dto/ens_username_dto.nim b/src/app_service/service/ens/dto/ens_username_dto.nim
index 1cdef21361..8f4b3ceaf6 100644
--- a/src/app_service/service/ens/dto/ens_username_dto.nim
+++ b/src/app_service/service/ens/dto/ens_username_dto.nim
@@ -15,7 +15,7 @@ proc `==`*(l, r: EnsUsernameDto): bool =
     return l.chainId == r.chainid and l.username == r.username
 
 proc `$`*(self: EnsUsernameDto): string =
-  result = fmt"""EnsUsernameDto(
+  result = fmt"""ContactDto(
     chainId: {self.chainId},
     username: {self.username},
     txType: {self.txType},
diff --git a/ui/app/AppLayouts/Chat/views/ChatView.qml b/ui/app/AppLayouts/Chat/views/ChatView.qml
index 6bf897db64..a27b6a96ff 100644
--- a/ui/app/AppLayouts/Chat/views/ChatView.qml
+++ b/ui/app/AppLayouts/Chat/views/ChatView.qml
@@ -179,17 +179,7 @@ StatusSectionLayout {
             store: root.rootStore
             label: qsTr("Members")
             communityMemberReevaluationStatus: root.rootStore.communityMemberReevaluationStatus
-            usersModel: {
-                if (!root.chatContentModule || !root.chatContentModule.chatDetails) {
-                    return null
-                }
-                let isFullCommunityList = !root.chatContentModule.chatDetails.requiresPermissions
-                if (root.chatContentModule.chatDetails.belongsToCommunity && isFullCommunityList) {
-                    // Community channel with no permisisons. We can use the section's membersModel
-                    return root.rootStore.chatCommunitySectionModule.membersModel
-                }
-                return root.chatContentModule.usersModule ? root.chatContentModule.usersModule.model : null
-            }
+            usersModel: root.chatContentModule && root.chatContentModule.usersModule ? root.chatContentModule.usersModule.model : null
         }
     }