diff --git a/common/queue/src/main/java/org/thingsboard/server/queue/sqs/TbAwsSqsProducerTemplate.java b/common/queue/src/main/java/org/thingsboard/server/queue/sqs/TbAwsSqsProducerTemplate.java
index 3e508b09e6..a4e977b6f0 100644
--- a/common/queue/src/main/java/org/thingsboard/server/queue/sqs/TbAwsSqsProducerTemplate.java
+++ b/common/queue/src/main/java/org/thingsboard/server/queue/sqs/TbAwsSqsProducerTemplate.java
@@ -87,8 +87,9 @@ public class TbAwsSqsProducerTemplate<T extends TbQueueMsg> implements TbQueuePr
         sendMsgRequest.withQueueUrl(getQueueUrl(tpi.getFullTopicName()));
         sendMsgRequest.withMessageBody(gson.toJson(new DefaultTbQueueMsg(msg)));
 
-        sendMsgRequest.withMessageGroupId(tpi.getTopic());
-        sendMsgRequest.withMessageDeduplicationId(UUID.randomUUID().toString());
+        String sqsMsgId = UUID.randomUUID().toString();
+        sendMsgRequest.withMessageGroupId(sqsMsgId);
+        sendMsgRequest.withMessageDeduplicationId(sqsMsgId);
 
         ListenableFuture<SendMessageResult> future = producerExecutor.submit(() -> sqsClient.sendMessage(sendMsgRequest));
 
diff --git a/docker/queue-kafka.env b/docker/queue-kafka.env
index 0207d64ef5..63107942fb 100644
--- a/docker/queue-kafka.env
+++ b/docker/queue-kafka.env
@@ -1,3 +1,2 @@
 TB_QUEUE_TYPE=kafka
 TB_KAFKA_SERVERS=kafka:9092
-TB_QUEUE_KAFKA_JE_TOPIC_PROPERTIES=retention.ms:604800000;segment.bytes:26214400;retention.bytes:104857600;partitions:100
diff --git a/msa/js-executor/queue/awsSqsTemplate.js b/msa/js-executor/queue/awsSqsTemplate.js
index 52d4997f33..24315e5cad 100644
--- a/msa/js-executor/queue/awsSqsTemplate.js
+++ b/msa/js-executor/queue/awsSqsTemplate.js
@@ -52,11 +52,13 @@ function AwsSqsProducer() {
             queueUrls.set(responseTopic, responseQueueUrl);
         }
 
+        let msgId = uuid();
+
         let params = {
             MessageBody: msgBody,
             QueueUrl: responseQueueUrl,
-            MessageGroupId: 'js_eval',
-            MessageDeduplicationId: uuid()
+            MessageGroupId: msgId,
+            MessageDeduplicationId: msgId
         };
 
         return new Promise((resolve, reject) => {