diff --git a/dao/src/main/java/org/thingsboard/server/dao/entity/BaseEntityService.java b/dao/src/main/java/org/thingsboard/server/dao/entity/BaseEntityService.java
index 6e32901517..a762aabf38 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/entity/BaseEntityService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/entity/BaseEntityService.java
@@ -86,6 +86,7 @@ public class BaseEntityService extends AbstractEntityService implements EntitySe
     EntityServiceRegistry entityServiceRegistry;
 
     @Autowired
+    @Lazy
     private EdqsApiService edqsApiService;
 
     @Override