diff --git a/application/src/main/java/org/thingsboard/server/service/queue/ruleengine/TbRuleEngineConsumerContext.java b/application/src/main/java/org/thingsboard/server/service/queue/ruleengine/TbRuleEngineConsumerContext.java
index b18df6b62b..da2a5d0db4 100644
--- a/application/src/main/java/org/thingsboard/server/service/queue/ruleengine/TbRuleEngineConsumerContext.java
+++ b/application/src/main/java/org/thingsboard/server/service/queue/ruleengine/TbRuleEngineConsumerContext.java
@@ -19,6 +19,7 @@ import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
+import org.thingsboard.common.util.ThingsBoardExecutors;
 import org.thingsboard.common.util.ThingsBoardThreadFactory;
 import org.thingsboard.server.actors.ActorSystemContext;
 import org.thingsboard.server.common.stats.StatsFactory;
@@ -76,7 +77,7 @@ public class TbRuleEngineConsumerContext {
     @PostConstruct
     void init() {
         this.consumersExecutor = Executors.newCachedThreadPool(ThingsBoardThreadFactory.forName("tb-rule-engine-consumer"));
-        this.mgmtExecutor = Executors.newFixedThreadPool(mgmtThreadPoolSize, ThingsBoardThreadFactory.forName("tb-rule-engine-mgmt"));
+        this.mgmtExecutor = ThingsBoardExecutors.newWorkStealingPool(mgmtThreadPoolSize, "tb-rule-engine-mgmt");
         this.scheduler = Executors.newSingleThreadScheduledExecutor(ThingsBoardThreadFactory.forName("tb-rule-engine-consumer-scheduler"));
     }
 
diff --git a/ui-ngx/src/app/modules/home/components/profile/tenant-profile.component.ts b/ui-ngx/src/app/modules/home/components/profile/tenant-profile.component.ts
index 26d6611a3c..3f048ab2e3 100644
--- a/ui-ngx/src/app/modules/home/components/profile/tenant-profile.component.ts
+++ b/ui-ngx/src/app/modules/home/components/profile/tenant-profile.component.ts
@@ -56,7 +56,7 @@ export class TenantProfileComponent extends EntityComponent<TenantProfile> {
     const mainQueue = [
       {
         id: guid(),
-        consumerPerPartition: true,
+        consumerPerPartition: false,
         name: 'Main',
         packProcessingTimeout: 10000,
         partitions: 1,
@@ -84,7 +84,7 @@ export class TenantProfileComponent extends EntityComponent<TenantProfile> {
         topic: 'tb_rule_engine.hp',
         pollInterval: 2000,
         partitions: 1,
-        consumerPerPartition: true,
+        consumerPerPartition: false,
         packProcessingTimeout: 10000,
         submitStrategy: {
           type: 'BURST',
@@ -108,7 +108,7 @@ export class TenantProfileComponent extends EntityComponent<TenantProfile> {
         topic: 'tb_rule_engine.sq',
         pollInterval: 2000,
         partitions: 1,
-        consumerPerPartition: true,
+        consumerPerPartition: false,
         packProcessingTimeout: 10000,
         submitStrategy: {
           type: 'SEQUENTIAL_BY_ORIGINATOR',