diff --git a/application/src/test/java/org/thingsboard/server/service/entitiy/EntityServiceTest.java b/application/src/test/java/org/thingsboard/server/service/entitiy/EntityServiceTest.java
index 0f0aeb21be..264ac70443 100644
--- a/application/src/test/java/org/thingsboard/server/service/entitiy/EntityServiceTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/entitiy/EntityServiceTest.java
@@ -1131,7 +1131,7 @@ public class EntityServiceTest extends AbstractControllerTest {
         String customerName = result.getData().get(0).getLatest().get(EntityKeyType.ENTITY_FIELD).get("name").getValue();
         assertThat(customerName).isEqualTo(TEST_CUSTOMER_NAME);
 
-        // find by customer user with generic permission
+        // find by customer user
         PageData<EntityData> customerResults = findByQueryAndCheck(customerId, query, 1);
 
         customerName = customerResults.getData().get(0).getLatest().get(EntityKeyType.ENTITY_FIELD).get("name").getValue();
diff --git a/common/edqs/src/main/java/org/thingsboard/server/edqs/query/processor/AbstractQueryProcessor.java b/common/edqs/src/main/java/org/thingsboard/server/edqs/query/processor/AbstractQueryProcessor.java
index d1f0d45984..30e963c252 100644
--- a/common/edqs/src/main/java/org/thingsboard/server/edqs/query/processor/AbstractQueryProcessor.java
+++ b/common/edqs/src/main/java/org/thingsboard/server/edqs/query/processor/AbstractQueryProcessor.java
@@ -64,9 +64,9 @@ public abstract class AbstractQueryProcessor<T extends EntityFilter> implements
     }
 
     protected static boolean checkCustomerId(UUID customerId, EntityData<?> ed) {
-        return customerId.equals(ed.getCustomerId()) || (ed.getEntityType() == EntityType.DASHBOARD &&
-                ed.getFields().getAssignedCustomerIds().contains(customerId)
-                || (ed.getEntityType() == EntityType.CUSTOMER && customerId.equals(ed.getId())));
+        return customerId.equals(ed.getCustomerId())
+                || (ed.getEntityType() == EntityType.DASHBOARD && ed.getFields().getAssignedCustomerIds().contains(customerId))
+                || (ed.getEntityType() == EntityType.CUSTOMER && customerId.equals(ed.getId()));
     }
 
     protected boolean matches(EntityData<?> ed) {