diff --git a/application/src/main/java/org/thingsboard/server/actors/ruleChain/DefaultTbContext.java b/application/src/main/java/org/thingsboard/server/actors/ruleChain/DefaultTbContext.java
index 7d5ad5744f..ac1a9b6758 100644
--- a/application/src/main/java/org/thingsboard/server/actors/ruleChain/DefaultTbContext.java
+++ b/application/src/main/java/org/thingsboard/server/actors/ruleChain/DefaultTbContext.java
@@ -722,11 +722,6 @@ class DefaultTbContext implements TbContext {
         return mainCtx.getTenantProfileCache().get(getTenantId());
     }
 
-    @Override
-    public TenantProfile getTenantProfile(TenantId tenantId) {
-        return mainCtx.getTenantProfileCache().get(tenantId);
-    }
-
     @Override
     public WidgetsBundleService getWidgetBundleService() {
         return mainCtx.getWidgetsBundleService();
diff --git a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbContext.java b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbContext.java
index 7c539d50f0..7578ed1009 100644
--- a/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbContext.java
+++ b/rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbContext.java
@@ -308,8 +308,6 @@ public interface TbContext {
 
     TenantProfile getTenantProfile();
 
-    TenantProfile getTenantProfile(TenantId tenantId);
-
     WidgetsBundleService getWidgetBundleService();
 
     WidgetTypeService getWidgetTypeService();
diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/util/EntitiesTenantIdAsyncLoader.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/util/EntitiesTenantIdAsyncLoader.java
index 3401227987..6eb4355dd3 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/util/EntitiesTenantIdAsyncLoader.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/util/EntitiesTenantIdAsyncLoader.java
@@ -100,7 +100,7 @@ public class EntitiesTenantIdAsyncLoader {
                 hasTenantId = Futures.immediateFuture(ctx.getWidgetBundleService().findWidgetsBundleById(tenantId, new WidgetsBundleId(id)));
                 break;
             case RPC:
-                hasTenantId = ctx.getRpcService().findRpcByIdAsync(ctx.getTenantId(), new RpcId(id));
+                hasTenantId = ctx.getRpcService().findRpcByIdAsync(tenantId, new RpcId(id));
                 break;
             case QUEUE:
                 hasTenantId = Futures.immediateFuture(ctx.getQueueService().findQueueById(tenantId, new QueueId(id)));
@@ -112,16 +112,18 @@ public class EntitiesTenantIdAsyncLoader {
                 hasTenantId = ctx.getResourceService().findResourceInfoByIdAsync(tenantId, new TbResourceId(id));
                 break;
             case RULE_NODE:
-                hasTenantId = null;
                 RuleNode ruleNode = ctx.getRuleChainService().findRuleNodeById(tenantId, new RuleNodeId(id));
                 if (ruleNode != null) {
-                    return Futures.immediateFuture(tenantId);
+                    hasTenantId = ctx.getRuleChainService().findRuleChainByIdAsync(tenantId, ruleNode.getRuleChainId());
+                } else {
+                    hasTenantId = Futures.immediateFuture(null);
                 }
                 break;
             case TENANT_PROFILE:
-                hasTenantId = null;
-                if (ctx.getTenantProfile() == ctx.getTenantProfile(new TenantId(id))) {
+                if (ctx.getTenantProfile().getId().equals(id)) {
                     return Futures.immediateFuture(tenantId);
+                } else {
+                    hasTenantId = Futures.immediateFuture(null);
                 }
                 break;
             default: