diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/sqs/TbAwsSqsAdmin.java b/common/queue/src/main/java/org/thingsboard/server/queue/sqs/TbAwsSqsAdmin.java
index 337bb271e5..7ef3b26b27 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/sqs/TbAwsSqsAdmin.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/sqs/TbAwsSqsAdmin.java
@@ -115,5 +115,8 @@ public class TbAwsSqsAdmin implements TbQueueAdmin {
         if (sqsClient != null) {
             sqsClient.shutdown();
         }
+        if (producerExecutor != null) {
+            producerExecutor.shutdownNow();
+        }
     }
 }