diff --git a/src/app/modules/main/chat_section/module.nim b/src/app/modules/main/chat_section/module.nim
index 4c78922fd4..3f60f7e4b8 100644
--- a/src/app/modules/main/chat_section/module.nim
+++ b/src/app/modules/main/chat_section/module.nim
@@ -367,7 +367,7 @@ proc createItemFromPublicKey(self: Module, publicKey: string): UserItem =
 
 proc initContactRequestsModel(self: Module) =
   var contactsWhoAddedMe: seq[UserItem]
-  let contacts =  self.controller.getContacts(ContactsGroup.IncomingPendingContactRequests)
+  let contacts = self.controller.getContacts(ContactsGroup.IncomingPendingContactRequests)
   for c in contacts:
     let item = self.createItemFromPublicKey(c.id)
     contactsWhoAddedMe.add(item)
@@ -378,7 +378,7 @@ proc rebuildCommunityTokenPermissionsModel(self: Module) =
   let community = self.controller.getMyCommunity()
   var tokenPermissionsItems: seq[TokenPermissionItem] = @[]
 
-  for id, tokenPermission in community.tokenPermissions:
+  for _, tokenPermission in community.tokenPermissions:
     let chats = community.getCommunityChats(tokenPermission.chatIds)
     let tokenPermissionItem = buildTokenPermissionItem(tokenPermission, chats)
     tokenPermissionsItems.add(tokenPermissionItem)
@@ -388,12 +388,12 @@ proc rebuildCommunityTokenPermissionsModel(self: Module) =
 
 proc reevaluateRequiresTokenPermissionToJoin(self: Module) =
   let community = self.controller.getMyCommunity()
-  var hasBecomeMemberOrBecomeAdminPermissions = false
-  for id, tokenPermission in community.tokenPermissions:
-    if tokenPermission.`type` == TokenPermissionType.BecomeMember or tokenPermission.`type` == TokenPermissionType.BecomeAdmin:
-      hasBecomeMemberOrBecomeAdminPermissions = true
-
-  self.view.setRequiresTokenPermissionToJoin(hasBecomeMemberOrBecomeAdminPermissions)
+  var joinPermissionsChanged = false
+  for _, tokenPermission in community.tokenPermissions:
+    if tokenPermission.`type` == TokenPermissionType.BecomeMember or tokenPermission.`type` == TokenPermissionType.BecomeAdmin or tokenPermission.`type` == TokenPermissionType.BecomeTokenMaster:
+      joinPermissionsChanged = true
+      break
+  self.view.setRequiresTokenPermissionToJoin(joinPermissionsChanged)
 
 proc initCommunityTokenPermissionsModel(self: Module, channelGroup: ChannelGroupDto) =
   self.rebuildCommunityTokenPermissionsModel()
@@ -1578,4 +1578,4 @@ method communityContainsChat*(self: Module, chatId: string): bool =
 method openCommunityChatAndScrollToMessage*(self: Module, chatId: string, messageId: string) =
   if chatId in self.chatContentModules:
     self.setActiveItem(chatId)
-    self.chatContentModules[chatId].scrollToMessage(messageId)
\ No newline at end of file
+    self.chatContentModules[chatId].scrollToMessage(messageId)
diff --git a/src/app/modules/shared_models/token_permission_item.nim b/src/app/modules/shared_models/token_permission_item.nim
index e2fe1132a5..e068977fc7 100644
--- a/src/app/modules/shared_models/token_permission_item.nim
+++ b/src/app/modules/shared_models/token_permission_item.nim
@@ -42,11 +42,8 @@ proc initTokenPermissionItem*(
   result.tokenCriteriaMet = tokenCriteriaMet
   result.state = state
 
-  for tcItem in tokenCriteria:
-    result.tokenCriteria.addItem(tcItem)
-
-  for clItem in chatList:
-    result.chatList.addItem(clItem)
+  result.tokenCriteria.setItems(tokenCriteria)
+  result.chatList.setItems(chatList)
 
 proc addTokenCriteria*(self: TokenPermissionItem, tokenCriteria: TokenCriteriaItem) =
   self.tokenCriteria.addItem(tokenCriteria)