diff --git a/src/app/modules/main/chat_section/module.nim b/src/app/modules/main/chat_section/module.nim
index fd42e44130..afd1d8ca8b 100644
--- a/src/app/modules/main/chat_section/module.nim
+++ b/src/app/modules/main/chat_section/module.nim
@@ -933,12 +933,13 @@ proc updateTokenPermissionModel*(self: Module, permissions: Table[string, CheckP
 
       var updatedTokenCriteriaItems: seq[TokenCriteriaItem] = @[]
       var permissionSatisfied = true
+      var aCriteriaChanged = false
 
       for index, tokenCriteriaItem in tokenPermissionItem.getTokenCriteria().getItems():
         let criteriaMet = criteriaResult.criteria[index]
 
-        if tokenCriteriaItem.criteriaMet == criteriaMet:
-          continue
+        if tokenCriteriaItem.criteriaMet != criteriaMet:
+          aCriteriaChanged = true
 
         let updatedTokenCriteriaItem = initTokenCriteriaItem(
           tokenCriteriaItem.symbol,
@@ -954,7 +955,7 @@ proc updateTokenPermissionModel*(self: Module, permissions: Table[string, CheckP
 
         updatedTokenCriteriaItems.add(updatedTokenCriteriaItem)
 
-      if updatedTokenCriteriaItems.len == 0:
+      if not aCriteriaChanged:
         continue
 
       thereWasAnUpdate = true
diff --git a/src/app/modules/main/communities/module.nim b/src/app/modules/main/communities/module.nim
index abe504f986..1b53e8a3b8 100644
--- a/src/app/modules/main/communities/module.nim
+++ b/src/app/modules/main/communities/module.nim
@@ -899,13 +899,13 @@ proc applyPermissionResponse*(self: Module, communityId: string, permissions: Ta
 
     var updatedTokenCriteriaItems: seq[TokenCriteriaItem] = @[]
     var permissionSatisfied = true
+    var aCriteriaChanged = false
 
     for index, tokenCriteriaItem in tokenPermissionItem.getTokenCriteria().getItems():
       let criteriaMet = criteriaResult.criteria[index]
 
-      if tokenCriteriaItem.criteriaMet == criteriaMet:
-        continue
-
+      if tokenCriteriaItem.criteriaMet != criteriaMet:
+          aCriteriaChanged = true
 
       let updatedTokenCriteriaItem = initTokenCriteriaItem(
         tokenCriteriaItem.symbol,
@@ -921,8 +921,9 @@ proc applyPermissionResponse*(self: Module, communityId: string, permissions: Ta
 
       updatedTokenCriteriaItems.add(updatedTokenCriteriaItem)
 
-    if updatedTokenCriteriaItems.len == 0:
+    if not aCriteriaChanged:
       continue
+      
     let updatedTokenPermissionItem = initTokenPermissionItem(
         tokenPermissionItem.id,
         tokenPermissionItem.`type`,