diff --git a/application/src/main/java/org/thingsboard/server/service/cf/AlarmCalculatedFieldResult.java b/application/src/main/java/org/thingsboard/server/service/cf/AlarmCalculatedFieldResult.java
index 61f9cf37ff..498a215e17 100644
--- a/application/src/main/java/org/thingsboard/server/service/cf/AlarmCalculatedFieldResult.java
+++ b/application/src/main/java/org/thingsboard/server/service/cf/AlarmCalculatedFieldResult.java
@@ -38,15 +38,20 @@ public class AlarmCalculatedFieldResult implements CalculatedFieldResult {
 
     @Override
     public TbMsg toTbMsg(EntityId entityId, List<CalculatedFieldId> cfIds) {
+        TbMsgType msgType;
         TbMsgMetaData metaData = new TbMsgMetaData();
         if (alarmResult.isCreated()) {
+            msgType = TbMsgType.ALARM_CREATED;
             metaData.putValue(DataConstants.IS_NEW_ALARM, Boolean.TRUE.toString());
         } else if (alarmResult.isUpdated()) {
+            msgType = TbMsgType.ALARM_UPDATED;
             metaData.putValue(DataConstants.IS_EXISTING_ALARM, Boolean.TRUE.toString());
         } else if (alarmResult.isSeverityUpdated()) {
+            msgType = TbMsgType.ALARM_SEVERITY_UPDATED;
             metaData.putValue(DataConstants.IS_EXISTING_ALARM, Boolean.TRUE.toString());
             metaData.putValue(DataConstants.IS_SEVERITY_UPDATED_ALARM, Boolean.TRUE.toString());
         } else {
+            msgType = TbMsgType.ALARM_CLEAR;
             metaData.putValue(DataConstants.IS_CLEARED_ALARM, Boolean.TRUE.toString());
         }
         if (alarmResult.getConditionRepeats() != null) {
@@ -57,7 +62,7 @@ public class AlarmCalculatedFieldResult implements CalculatedFieldResult {
         }
 
         return TbMsg.newMsg()
-                .type(TbMsgType.ALARM)
+                .type(msgType)
                 .originator(entityId)
                 .data(JacksonUtil.toString(alarmResult.getAlarm()))
                 .metaData(metaData)
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/msg/TbMsgType.java b/common/data/src/main/java/org/thingsboard/server/common/data/msg/TbMsgType.java
index e2949c96eb..720dc5b790 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/msg/TbMsgType.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/msg/TbMsgType.java
@@ -39,6 +39,9 @@ public enum TbMsgType {
     ATTRIBUTES_UPDATED("Attributes Updated"),
     ATTRIBUTES_DELETED("Attributes Deleted"),
     ALARM("Alarm"),
+    ALARM_CREATED("Alarm Created"),
+    ALARM_UPDATED("Alarm Updated"),
+    ALARM_SEVERITY_UPDATED("Alarm Severity Updated"),
     ALARM_ACK("Alarm Acknowledged"),
     ALARM_CLEAR("Alarm Cleared"),
     ALARM_DELETE,