diff --git a/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/KafkaCalculatedFieldStateService.java b/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/KafkaCalculatedFieldStateService.java
index edb47dd7fa..e81fa4d1dc 100644
--- a/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/KafkaCalculatedFieldStateService.java
+++ b/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/KafkaCalculatedFieldStateService.java
@@ -49,7 +49,7 @@ import static org.thingsboard.server.queue.common.AbstractTbQueueTemplate.*;
 @Service
 @RequiredArgsConstructor
 @Slf4j
-@ConditionalOnExpression("'${queue.type:null}'=='kafka'")
+@ConditionalOnExpression("('${service.type:null}'=='monolith' || '${service.type:null}'=='tb-rule-engine') && '${queue.type:null}'=='kafka'")
 public class KafkaCalculatedFieldStateService extends AbstractCalculatedFieldStateService {
 
     private final TbRuleEngineQueueFactory queueFactory;