diff --git a/common/edqs/src/main/java/org/thingsboard/server/edqs/state/EdqsController.java b/common/edqs/src/main/java/org/thingsboard/server/edqs/state/EdqsController.java
index 721675245a..06d5f89aa9 100644
--- a/common/edqs/src/main/java/org/thingsboard/server/edqs/state/EdqsController.java
+++ b/common/edqs/src/main/java/org/thingsboard/server/edqs/state/EdqsController.java
@@ -16,6 +16,7 @@
 package org.thingsboard.server.edqs.state;
 
 import lombok.RequiredArgsConstructor;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -23,6 +24,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 @RestController
 @RequiredArgsConstructor
+@ConditionalOnExpression("'${service.type:null}'=='edqs'")
 @RequestMapping("/api/edqs")
 public class EdqsController {