diff --git a/dao/src/main/java/org/thingsboard/server/dao/component/BaseComponentDescriptorService.java b/dao/src/main/java/org/thingsboard/server/dao/component/BaseComponentDescriptorService.java
index 5e9292af5f..4f2228fe57 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/component/BaseComponentDescriptorService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/component/BaseComponentDescriptorService.java
@@ -60,7 +60,7 @@ public class BaseComponentDescriptorService implements ComponentDescriptorServic
 
     @Override
     public ComponentDescriptor findById(TenantId tenantId, ComponentDescriptorId componentId) {
-        Validator.validateId(componentId, "Incorrect component id for search request.");
+        Validator.validateId(componentId, id -> "Incorrect component id for search request.");
         return componentDescriptorDao.findById(tenantId, componentId);
     }
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleChainService.java b/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleChainService.java
index fce0cec732..96d6a19346 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleChainService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleChainService.java
@@ -191,7 +191,7 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
     @Transactional
     @Override
     public RuleChainUpdateResult saveRuleChainMetaData(TenantId tenantId, RuleChainMetaData ruleChainMetaData, Function<RuleNode, RuleNode> ruleNodeUpdater, boolean publishSaveEvent) {
-        Validator.validateId(ruleChainMetaData.getRuleChainId(), "Incorrect rule chain id.");
+        Validator.validateId(ruleChainMetaData.getRuleChainId(), id -> "Incorrect rule chain id.");
         RuleChain ruleChain = findRuleChainById(tenantId, ruleChainMetaData.getRuleChainId());
         if (ruleChain == null) {
             return RuleChainUpdateResult.failed();
@@ -346,7 +346,7 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
 
     @Override
     public RuleChainMetaData loadRuleChainMetaData(TenantId tenantId, RuleChainId ruleChainId) {
-        Validator.validateId(ruleChainId, "Incorrect rule chain id.");
+        Validator.validateId(ruleChainId, id -> "Incorrect rule chain id.");
         RuleChainDetails ruleChainDetails = ruleChainDetailsDao.findById(tenantId, ruleChainId.getId());
         if (ruleChainDetails == null) {
             return null;
@@ -388,37 +388,37 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
 
     @Override
     public RuleChain findRuleChainById(TenantId tenantId, RuleChainId ruleChainId) {
-        Validator.validateId(ruleChainId, "Incorrect rule chain id for search request.");
+        Validator.validateId(ruleChainId, id -> "Incorrect rule chain id for search request.");
         return ruleChainDao.findById(tenantId, ruleChainId.getId());
     }
 
     @Override
     public RuleNode findRuleNodeById(TenantId tenantId, RuleNodeId ruleNodeId) {
-        Validator.validateId(ruleNodeId, "Incorrect rule node id for search request.");
+        Validator.validateId(ruleNodeId, id -> "Incorrect rule node id for search request.");
         return ruleNodeDao.findById(tenantId, ruleNodeId.getId());
     }
 
     @Override
     public ListenableFuture<RuleChain> findRuleChainByIdAsync(TenantId tenantId, RuleChainId ruleChainId) {
-        Validator.validateId(ruleChainId, "Incorrect rule chain id for search request.");
+        Validator.validateId(ruleChainId, id -> "Incorrect rule chain id for search request.");
         return ruleChainDao.findByIdAsync(tenantId, ruleChainId.getId());
     }
 
     @Override
     public ListenableFuture<RuleNode> findRuleNodeByIdAsync(TenantId tenantId, RuleNodeId ruleNodeId) {
-        Validator.validateId(ruleNodeId, "Incorrect rule node id for search request.");
+        Validator.validateId(ruleNodeId, id -> "Incorrect rule node id for search request.");
         return ruleNodeDao.findByIdAsync(tenantId, ruleNodeId.getId());
     }
 
     @Override
     public RuleChain getRootTenantRuleChain(TenantId tenantId) {
-        Validator.validateId(tenantId, "Incorrect tenant id for search request.");
+        Validator.validateId(tenantId, id -> "Incorrect tenant id for search request.");
         return ruleChainDao.findRootRuleChainByTenantIdAndType(tenantId.getId(), RuleChainType.CORE);
     }
 
     @Override
     public List<RuleNode> getRuleChainNodes(TenantId tenantId, RuleChainId ruleChainId) {
-        Validator.validateId(ruleChainId, "Incorrect rule chain id for search request.");
+        Validator.validateId(ruleChainId, id -> "Incorrect rule chain id for search request.");
         List<EntityRelation> relations = getRuleChainToNodeRelations(tenantId, ruleChainId);
         List<RuleNode> ruleNodes = new ArrayList<>();
         for (EntityRelation relation : relations) {
@@ -434,7 +434,7 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
 
     @Override
     public List<RuleNode> getReferencingRuleChainNodes(TenantId tenantId, RuleChainId ruleChainId) {
-        Validator.validateId(ruleChainId, "Incorrect rule chain id for search request.");
+        Validator.validateId(ruleChainId, id -> "Incorrect rule chain id for search request.");
         List<EntityRelation> relations = getNodeToRuleChainRelations(tenantId, ruleChainId);
         List<RuleNode> ruleNodes = new ArrayList<>();
         for (EntityRelation relation : relations) {
@@ -448,7 +448,7 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
 
     @Override
     public List<EntityRelation> getRuleNodeRelations(TenantId tenantId, RuleNodeId ruleNodeId) {
-        Validator.validateId(ruleNodeId, "Incorrect rule node id for search request.");
+        Validator.validateId(ruleNodeId, id -> "Incorrect rule node id for search request.");
         List<EntityRelation> relations = relationService.findByFrom(tenantId, ruleNodeId, RelationTypeGroup.RULE_NODE);
         List<EntityRelation> validRelations = new ArrayList<>();
         for (EntityRelation relation : relations) {
@@ -475,7 +475,7 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
 
     @Override
     public PageData<RuleChain> findTenantRuleChainsByType(TenantId tenantId, RuleChainType type, PageLink pageLink) {
-        Validator.validateId(tenantId, "Incorrect tenant id for search rule chain request.");
+        Validator.validateId(tenantId, id -> "Incorrect tenant id for search rule chain request.");
         Validator.validatePageLink(pageLink);
         return ruleChainDao.findRuleChainsByTenantIdAndType(tenantId.getId(), type, pageLink);
     }
@@ -488,7 +488,7 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
     @Override
     @Transactional
     public void deleteRuleChainById(TenantId tenantId, RuleChainId ruleChainId) {
-        Validator.validateId(ruleChainId, "Incorrect rule chain id for delete request.");
+        Validator.validateId(ruleChainId, id -> "Incorrect rule chain id for delete request.");
         RuleChain ruleChain = ruleChainDao.findById(tenantId, ruleChainId.getId());
         if (ruleChain == null) {
             return;
@@ -527,7 +527,7 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
     @Transactional
     @Override
     public void deleteRuleChainsByTenantId(TenantId tenantId) {
-        Validator.validateId(tenantId, "Incorrect tenant id for delete rule chains request.");
+        Validator.validateId(tenantId, id -> "Incorrect tenant id for delete rule chains request.");
         tenantRuleChainsRemover.removeEntities(tenantId, tenantId);
     }
 
@@ -539,7 +539,7 @@ public class BaseRuleChainService extends AbstractEntityService implements RuleC
 
     @Override
     public RuleChainData exportTenantRuleChains(TenantId tenantId, PageLink pageLink) {
-        Validator.validateId(tenantId, "Incorrect tenant id for search rule chain request.");
+        Validator.validateId(tenantId, id -> "Incorrect tenant id for search rule chain request.");
         Validator.validatePageLink(pageLink);
         PageData<RuleChain> ruleChainData = ruleChainDao.findRuleChainsByTenantId(tenantId.getId(), pageLink);
         List<RuleChain> ruleChains = ruleChainData.getData();