diff --git a/application/src/main/java/org/thingsboard/server/actors/service/DefaultActorService.java b/application/src/main/java/org/thingsboard/server/actors/service/DefaultActorService.java
index 7a28c205bc..6f359c00b0 100644
--- a/application/src/main/java/org/thingsboard/server/actors/service/DefaultActorService.java
+++ b/application/src/main/java/org/thingsboard/server/actors/service/DefaultActorService.java
@@ -102,15 +102,7 @@ public class DefaultActorService extends TbApplicationEventListener<PartitionCha
     }
 
     private ExecutorService initDispatcherExecutor(String dispatcherName, int poolSize) {
-        if (poolSize == 0) {
-            int cores = Runtime.getRuntime().availableProcessors();
-            poolSize = Math.max(1, cores / 2);
-        }
-        if (poolSize == 1) {
-            return Executors.newSingleThreadExecutor(ThingsBoardThreadFactory.forName(dispatcherName));
-        } else {
-            return ThingsBoardExecutors.newWorkStealingPool(poolSize, dispatcherName);
-        }
+        return Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors() + 1, ThingsBoardThreadFactory.forName(dispatcherName));
     }
 
     @EventListener(ApplicationReadyEvent.class)
diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/common/DefaultTbQueueRequestTemplate.java b/common/queue/src/main/java/org/thingsboard/server/queue/common/DefaultTbQueueRequestTemplate.java
index 5b03e1bc2d..f6a5b33289 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/common/DefaultTbQueueRequestTemplate.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/common/DefaultTbQueueRequestTemplate.java
@@ -41,6 +41,7 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.LockSupport;
 import java.util.concurrent.locks.ReentrantLock;
 
 @Slf4j
@@ -97,7 +98,7 @@ public class DefaultTbQueueRequestTemplate<Request extends TbQueueMsg, Response
             try {
                 fetchAndProcessResponses();
             } catch (Throwable e) {
-                log.warn("Failed to obtain responses from queue. Going to sleep " + pollInterval + "ms", e);
+                log.warn("Failed to obtain and process responses from queue. Going to sleep " + pollInterval + "ms", e);
                 sleep();
             }
         }
@@ -149,11 +150,8 @@ public class DefaultTbQueueRequestTemplate<Request extends TbQueueMsg, Response
     }
 
     void sleep() {
-        try {
-            Thread.sleep(pollInterval);
-        } catch (InterruptedException e2) {
-            log.trace("Failed to wait until the server has capacity to handle new responses", e2);
-        }
+        Thread.yield();
+        LockSupport.parkNanos(1);
     }
 
     void setTimeoutException(UUID key, ResponseMetaData<Response> staleRequest, long currentNs) {