diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/QueueMsgConstructor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/QueueMsgConstructor.java
index eddae225cf..85362ff70b 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/QueueMsgConstructor.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/QueueMsgConstructor.java
@@ -35,6 +35,8 @@ public class QueueMsgConstructor {
                 .setMsgType(msgType)
                 .setIdMSB(queue.getId().getId().getMostSignificantBits())
                 .setIdLSB(queue.getId().getId().getLeastSignificantBits())
+                .setTenantIdMSB(queue.getTenantId().getId().getMostSignificantBits())
+                .setTenantIdLSB(queue.getTenantId().getId().getLeastSignificantBits())
                 .setName(queue.getName())
                 .setTopic(queue.getTopic())
                 .setPollInterval(queue.getPollInterval())
diff --git a/application/src/test/java/org/thingsboard/server/edge/BaseEdgeTest.java b/application/src/test/java/org/thingsboard/server/edge/BaseEdgeTest.java
index 3cea7da5f2..4e18034ede 100644
--- a/application/src/test/java/org/thingsboard/server/edge/BaseEdgeTest.java
+++ b/application/src/test/java/org/thingsboard/server/edge/BaseEdgeTest.java
@@ -1813,6 +1813,10 @@ abstract public class BaseEdgeTest extends AbstractControllerTest {
         Assert.assertTrue(latestMessage instanceof QueueUpdateMsg);
         QueueUpdateMsg queueUpdateMsg = (QueueUpdateMsg) latestMessage;
         Assert.assertEquals(UpdateMsgType.ENTITY_CREATED_RPC_MESSAGE, queueUpdateMsg.getMsgType());
+        Assert.assertEquals(savedQueue.getUuidId().getMostSignificantBits(), queueUpdateMsg.getIdMSB());
+        Assert.assertEquals(savedQueue.getUuidId().getLeastSignificantBits(), queueUpdateMsg.getIdLSB());
+        Assert.assertEquals(savedQueue.getTenantId().getId().getMostSignificantBits(), queueUpdateMsg.getTenantIdMSB());
+        Assert.assertEquals(savedQueue.getTenantId().getId().getLeastSignificantBits(), queueUpdateMsg.getTenantIdLSB());
         Assert.assertEquals("EdgeMain", queueUpdateMsg.getName());
         Assert.assertEquals("tb_rule_engine.EdgeMain", queueUpdateMsg.getTopic());
         Assert.assertEquals(25, queueUpdateMsg.getPollInterval());
@@ -1829,6 +1833,17 @@ abstract public class BaseEdgeTest extends AbstractControllerTest {
 
         // 2
         edgeImitator.expectMessageAmount(1);
+        savedQueue.setPollInterval(50);
+        savedQueue = doPost("/api/queues?serviceType=" + ServiceType.TB_RULE_ENGINE.name(), savedQueue, Queue.class);
+        Assert.assertTrue(edgeImitator.waitForMessages());
+        latestMessage = edgeImitator.getLatestMessage();
+        Assert.assertTrue(latestMessage instanceof QueueUpdateMsg);
+        queueUpdateMsg = (QueueUpdateMsg) latestMessage;
+        Assert.assertEquals(UpdateMsgType.ENTITY_UPDATED_RPC_MESSAGE, queueUpdateMsg.getMsgType());
+        Assert.assertEquals(50, queueUpdateMsg.getPollInterval());
+
+        // 3
+        edgeImitator.expectMessageAmount(1);
         doDelete("/api/queues/" + savedQueue.getUuidId())
                 .andExpect(status().isOk());
         Assert.assertTrue(edgeImitator.waitForMessages());
diff --git a/common/edge-api/src/main/proto/edge.proto b/common/edge-api/src/main/proto/edge.proto
index 600fb8722d..90f4b824ef 100644
--- a/common/edge-api/src/main/proto/edge.proto
+++ b/common/edge-api/src/main/proto/edge.proto
@@ -445,14 +445,16 @@ message QueueUpdateMsg {
   UpdateMsgType msgType = 1;
   int64 idMSB = 2;
   int64 idLSB = 3;
-  string name = 4;
-  string topic = 5;
-  int32 pollInterval = 6;
-  int32 partitions = 7;
-  bool consumerPerPartition = 8;
-  int64 packProcessingTimeout = 9;
-  SubmitStrategyProto submitStrategy = 10;
-  ProcessingStrategyProto processingStrategy = 11;
+  int64 tenantIdMSB = 4;
+  int64 tenantIdLSB = 5;
+  string name = 6;
+  string topic = 7;
+  int32 pollInterval = 8;
+  int32 partitions = 9;
+  bool consumerPerPartition = 10;
+  int64 packProcessingTimeout = 11;
+  SubmitStrategyProto submitStrategy = 12;
+  ProcessingStrategyProto processingStrategy = 13;
 }
 
 message SubmitStrategyProto {