diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/rule/BaseRuleChainProcessor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/rule/BaseRuleChainProcessor.java
index dc9fa6e14d..66a471e3a0 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/rule/BaseRuleChainProcessor.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/rule/BaseRuleChainProcessor.java
@@ -41,7 +41,7 @@ import java.util.function.Function;
 @Slf4j
 public class BaseRuleChainProcessor extends BaseEdgeProcessor {
 
-    protected boolean saveOrUpdateRuleChain(TenantId tenantId, RuleChainId ruleChainId, RuleChainUpdateMsg ruleChainUpdateMsg) {
+    protected boolean saveOrUpdateRuleChain(TenantId tenantId, RuleChainId ruleChainId, RuleChainUpdateMsg ruleChainUpdateMsg, RuleChainType ruleChainType) {
         boolean created = false;
         RuleChain ruleChain = ruleChainService.findRuleChainById(tenantId, ruleChainId);
         if (ruleChain == null) {
@@ -51,7 +51,7 @@ public class BaseRuleChainProcessor extends BaseEdgeProcessor {
             ruleChain.setCreatedTime(Uuids.unixTimestamp(ruleChainId.getId()));
         }
         ruleChain.setName(ruleChainUpdateMsg.getName());
-        ruleChain.setType(RuleChainType.EDGE);
+        ruleChain.setType(ruleChainType);
         ruleChain.setDebugMode(ruleChainUpdateMsg.getDebugMode());
         ruleChain.setConfiguration(JacksonUtil.toJsonNode(ruleChainUpdateMsg.getConfiguration()));
 
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/rule/RuleChainEdgeProcessor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/rule/RuleChainEdgeProcessor.java
index ae5e158ba7..e2ce1fe651 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/rule/RuleChainEdgeProcessor.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/rule/RuleChainEdgeProcessor.java
@@ -28,6 +28,7 @@ import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.msg.TbMsgType;
 import org.thingsboard.server.common.data.rule.RuleChain;
 import org.thingsboard.server.common.data.rule.RuleChainMetaData;
+import org.thingsboard.server.common.data.rule.RuleChainType;
 import org.thingsboard.server.common.msg.TbMsgMetaData;
 import org.thingsboard.server.dao.exception.DataValidationException;
 import org.thingsboard.server.gen.edge.v1.DownlinkMsg;
@@ -105,7 +106,7 @@ public class RuleChainEdgeProcessor extends BaseRuleChainProcessor {
     }
 
     private void saveOrUpdateRuleChain(TenantId tenantId, RuleChainId ruleChainId, RuleChainUpdateMsg ruleChainUpdateMsg, Edge edge) {
-        boolean created = super.saveOrUpdateRuleChain(tenantId, ruleChainId, ruleChainUpdateMsg);
+        boolean created = super.saveOrUpdateRuleChain(tenantId, ruleChainId, ruleChainUpdateMsg, RuleChainType.EDGE);
         if (created) {
             createRelationFromEdge(tenantId, edge.getId(), ruleChainId);
             pushRuleChainCreatedEventToRuleEngine(tenantId, edge, ruleChainId);
diff --git a/application/src/test/java/org/thingsboard/server/service/edge/rpc/processor/BaseEdgeProcessorTest.java b/application/src/test/java/org/thingsboard/server/service/edge/rpc/processor/BaseEdgeProcessorTest.java
index 1c4b481302..9519362305 100644
--- a/application/src/test/java/org/thingsboard/server/service/edge/rpc/processor/BaseEdgeProcessorTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/edge/rpc/processor/BaseEdgeProcessorTest.java
@@ -31,6 +31,7 @@ import org.thingsboard.server.common.data.id.DashboardId;
 import org.thingsboard.server.common.data.id.EdgeId;
 import org.thingsboard.server.common.data.id.RuleChainId;
 import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.rule.RuleChain;
 import org.thingsboard.server.dao.alarm.AlarmService;
 import org.thingsboard.server.dao.asset.AssetProfileService;
 import org.thingsboard.server.dao.asset.AssetService;
@@ -196,6 +197,9 @@ public abstract class BaseEdgeProcessorTest {
     @MockBean
     protected DataValidator<EntityView> entityViewValidator;
 
+    @MockBean
+    protected DataValidator<RuleChain> ruleChainValidator;
+
     @MockBean
     protected EdgeMsgConstructor edgeMsgConstructor;