diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/AlarmMsgConstructor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/AlarmMsgConstructor.java
index c1fc9f0585..039280a76c 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/AlarmMsgConstructor.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/constructor/AlarmMsgConstructor.java
@@ -58,6 +58,8 @@ public class AlarmMsgConstructor {
         }
         AlarmUpdateMsg.Builder builder = AlarmUpdateMsg.newBuilder()
                 .setMsgType(msgType)
+                .setIdMSB(alarm.getId().getId().getMostSignificantBits())
+                .setIdLSB(alarm.getId().getId().getLeastSignificantBits())
                 .setName(alarm.getName())
                 .setType(alarm.getType())
                 .setOriginatorName(entityName)
diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/AlarmEdgeProcessor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/AlarmEdgeProcessor.java
index c2e5dc2e3e..f6525640d4 100644
--- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/AlarmEdgeProcessor.java
+++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/AlarmEdgeProcessor.java
@@ -54,6 +54,7 @@ public class AlarmEdgeProcessor extends BaseEdgeProcessor {
         EntityId originatorId = getAlarmOriginator(tenantId, alarmUpdateMsg.getOriginatorName(),
                 EntityType.valueOf(alarmUpdateMsg.getOriginatorType()));
         if (originatorId == null) {
+            log.warn("Originator not found for the alarm msg {}", alarmUpdateMsg);
             return Futures.immediateFuture(null);
         }
         try {
diff --git a/common/edge-api/src/main/proto/edge.proto b/common/edge-api/src/main/proto/edge.proto
index 11f6f0e343..af041151c6 100644
--- a/common/edge-api/src/main/proto/edge.proto
+++ b/common/edge-api/src/main/proto/edge.proto
@@ -250,18 +250,20 @@ message EntityViewUpdateMsg {
 
 message AlarmUpdateMsg {
   UpdateMsgType msgType = 1;
-  string name = 2;
-  string type = 3;
-  string originatorType = 4;
-  string originatorName = 5;
-  string severity = 6;
-  string status = 7;
-  int64 startTs = 8;
-  int64 endTs = 9;
-  int64 ackTs = 10;
-  int64 clearTs = 11;
-  string details = 12;
-  bool propagate = 13;
+  int64 idMSB = 2;
+  int64 idLSB = 3;
+  string name = 4;
+  string type = 5;
+  string originatorType = 6;
+  string originatorName = 7;
+  string severity = 8;
+  string status = 9;
+  int64 startTs = 10;
+  int64 endTs = 11;
+  int64 ackTs = 12;
+  int64 clearTs = 13;
+  string details = 14;
+  bool propagate = 15;
 }
 
 message CustomerUpdateMsg {