diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/common/AbstractTbQueueConsumerTemplate.java b/common/queue/src/main/java/org/thingsboard/server/queue/common/AbstractTbQueueConsumerTemplate.java
index c8cc545601..8512eba1e7 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/common/AbstractTbQueueConsumerTemplate.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/common/AbstractTbQueueConsumerTemplate.java
@@ -85,7 +85,12 @@ public abstract class AbstractTbQueueConsumerTemplate<R, T extends TbQueueMsg> i
                     subscribed = true;
                 }
 
-                List<R> records = doPoll(durationInMillis);
+                List<R> records;
+                if (partitions.isEmpty()) {
+                    records = Collections.emptyList();
+                } else {
+                    records = doPoll(durationInMillis);
+                }
                 if (!records.isEmpty()) {
                     List<T> result = new ArrayList<>(records.size());
                     records.forEach(record -> {