diff --git a/dao/src/main/java/org/thingsboard/server/dao/nosql/CassandraBufferedRateReadExecutor.java b/dao/src/main/java/org/thingsboard/server/dao/nosql/CassandraBufferedRateReadExecutor.java
index a7aa0dc5dc..98cfef7f7d 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/nosql/CassandraBufferedRateReadExecutor.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/nosql/CassandraBufferedRateReadExecutor.java
@@ -52,7 +52,7 @@ public class CassandraBufferedRateReadExecutor extends AbstractBufferedRateExecu
             @Autowired StatsFactory statsFactory,
             @Autowired EntityService entityService,
             @Autowired RateLimitService rateLimitService,
-            @Autowired TbServiceInfoProvider serviceInfoProvider) {
+            @Autowired(required = false) TbServiceInfoProvider serviceInfoProvider) {
         super(queueLimit, concurrencyLimit, maxWaitTime, dispatcherThreads, callbackThreads, pollMs, printQueriesFreq, statsFactory,
                 entityService, rateLimitService, serviceInfoProvider, printTenantNames);
     }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/nosql/CassandraBufferedRateWriteExecutor.java b/dao/src/main/java/org/thingsboard/server/dao/nosql/CassandraBufferedRateWriteExecutor.java
index c61148e51f..1fb4b8dea5 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/nosql/CassandraBufferedRateWriteExecutor.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/nosql/CassandraBufferedRateWriteExecutor.java
@@ -52,7 +52,7 @@ public class CassandraBufferedRateWriteExecutor extends AbstractBufferedRateExec
             @Autowired StatsFactory statsFactory,
             @Autowired EntityService entityService,
             @Autowired RateLimitService rateLimitService,
-            @Autowired TbServiceInfoProvider serviceInfoProvider) {
+            @Autowired(required = false) TbServiceInfoProvider serviceInfoProvider) {
         super(queueLimit, concurrencyLimit, maxWaitTime, dispatcherThreads, callbackThreads, pollMs, printQueriesFreq, statsFactory,
                 entityService, rateLimitService, serviceInfoProvider, printTenantNames);
     }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/util/AbstractBufferedRateExecutor.java b/dao/src/main/java/org/thingsboard/server/dao/util/AbstractBufferedRateExecutor.java
index 0f6170f25d..444aecef71 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/util/AbstractBufferedRateExecutor.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/util/AbstractBufferedRateExecutor.java
@@ -141,6 +141,9 @@ public abstract class AbstractBufferedRateExecutor<T extends AsyncTask, F extend
     }
 
     private LimitedApi getMyLimitedApi() {
+        if (serviceInfoProvider == null) {
+            return getBufferedRateExecutorType().getMonolithLimitedApi();
+        }
         if (serviceInfoProvider.isMonolith()) {
             return getBufferedRateExecutorType().getMonolithLimitedApi();
         }