diff --git a/application/src/main/java/org/thingsboard/server/actors/ActorSystemContext.java b/application/src/main/java/org/thingsboard/server/actors/ActorSystemContext.java
index 2a4f132be8..e3ebbdf892 100644
--- a/application/src/main/java/org/thingsboard/server/actors/ActorSystemContext.java
+++ b/application/src/main/java/org/thingsboard/server/actors/ActorSystemContext.java
@@ -204,7 +204,7 @@ public class ActorSystemContext {
     @Getter
     private DeviceCredentialsService deviceCredentialsService;
 
-    @Autowired
+    @Autowired(required = false)
     @Getter
     private RuleEngineDeviceStateManager deviceStateManager;
 
diff --git a/application/src/main/java/org/thingsboard/server/service/state/DefaultRuleEngineDeviceStateManager.java b/application/src/main/java/org/thingsboard/server/service/state/DefaultRuleEngineDeviceStateManager.java
index 722fcd1aac..af2b03ec8f 100644
--- a/application/src/main/java/org/thingsboard/server/service/state/DefaultRuleEngineDeviceStateManager.java
+++ b/application/src/main/java/org/thingsboard/server/service/state/DefaultRuleEngineDeviceStateManager.java
@@ -29,12 +29,14 @@ import org.thingsboard.server.gen.transport.TransportProtos;
 import org.thingsboard.server.queue.common.SimpleTbQueueCallback;
 import org.thingsboard.server.queue.discovery.PartitionService;
 import org.thingsboard.server.queue.discovery.TbServiceInfoProvider;
+import org.thingsboard.server.queue.util.TbRuleEngineComponent;
 
 import java.util.Optional;
 import java.util.UUID;
 
 @Slf4j
 @Service
+@TbRuleEngineComponent
 public class DefaultRuleEngineDeviceStateManager implements RuleEngineDeviceStateManager {
 
     private final TbServiceInfoProvider serviceInfoProvider;