diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/kafka/TbKafkaConsumerTemplate.java b/common/queue/src/main/java/org/thingsboard/server/queue/kafka/TbKafkaConsumerTemplate.java
index 49d1d74102..541337579d 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/kafka/TbKafkaConsumerTemplate.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/kafka/TbKafkaConsumerTemplate.java
@@ -106,6 +106,7 @@ public class TbKafkaConsumerTemplate<T extends TbQueueMsg> implements TbQueueCon
                 if (!subscribed) {
                     List<String> topicNames = partitions.stream().map(TopicPartitionInfo::getFullTopicName).collect(Collectors.toList());
                     topicNames.forEach(admin::createTopicIfNotExists);
+                    consumer.unsubscribe();
                     consumer.subscribe(topicNames);
                     subscribed = true;
                 }
diff --git a/docker/tb-node.env b/docker/tb-node.env
index 542296babe..12cdc7d035 100644
--- a/docker/tb-node.env
+++ b/docker/tb-node.env
@@ -10,3 +10,5 @@ CACHE_TYPE=redis
 REDIS_HOST=redis
 
 HTTP_LOG_CONTROLLER_ERROR_STACK_TRACE=false
+
+TB_QUEUE_PARTITIONS_VIRTUAL_NODES_SIZE=64