diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/query/DefaultEntityQueryRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/query/DefaultEntityQueryRepository.java
index a838dedd1a..ac78e80685 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/query/DefaultEntityQueryRepository.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/query/DefaultEntityQueryRepository.java
@@ -716,12 +716,7 @@ public class DefaultEntityQueryRepository implements EntityQueryRepository {
     }
 
     int getMaxLevel(int maxLevel) {
-        int level = maxLevel > 0 ? maxLevel : this.maxLevelAllowed;
-        if (level > this.maxLevelAllowed) {
-            log.debug("hierarchy level {} is reduced down to maxLevelAllowed {}", level, this.maxLevelAllowed);
-            return this.maxLevelAllowed;
-        }
-        return level;
+        return (maxLevel <= 0 || maxLevel > this.maxLevelAllowed) ? this.maxLevelAllowed : maxLevel;
     }
 
     private String getQueryTemplate(EntitySearchDirection direction) {