diff --git a/application/src/main/java/org/thingsboard/server/service/telemetry/DefaultAlarmSubscriptionService.java b/application/src/main/java/org/thingsboard/server/service/telemetry/DefaultAlarmSubscriptionService.java
index c23f9a1272..9fab55218a 100644
--- a/application/src/main/java/org/thingsboard/server/service/telemetry/DefaultAlarmSubscriptionService.java
+++ b/application/src/main/java/org/thingsboard/server/service/telemetry/DefaultAlarmSubscriptionService.java
@@ -99,11 +99,11 @@ public class DefaultAlarmSubscriptionService extends AbstractSubscriptionService
         if (result.isSuccessful()) {
             onAlarmUpdated(result);
             AlarmSeverity oldSeverity = result.getOldSeverity();
-            if (oldSeverity != null && !oldSeverity.equals(result.getAlarm().getSeverity())) {
+            if (oldSeverity != null && !oldSeverity.equals(result.getAlarmInfo().getSeverity())) {
                 AlarmComment alarmComment = AlarmComment.builder()
                         .alarmId(alarm.getId())
                         .type(AlarmCommentType.SYSTEM)
-                        .comment(JacksonUtil.newObjectNode().put("text", String.format("Alarm severity was updated from %s to %s", oldSeverity, result.getAlarm().getSeverity())))
+                        .comment(JacksonUtil.newObjectNode().put("text", String.format("Alarm severity was updated from %s to %s", oldSeverity, result.getAlarmInfo().getSeverity())))
                         .build();
                 alarmCommentService.createOrUpdateAlarmComment(alarm.getTenantId(), alarmComment);
             }
diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/BaseAlarmCommentServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/BaseAlarmCommentServiceTest.java
index 914c360d86..7ade09a2c3 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/service/BaseAlarmCommentServiceTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/BaseAlarmCommentServiceTest.java
@@ -60,7 +60,7 @@ public abstract class BaseAlarmCommentServiceTest extends AbstractServiceTest {
                 .type(TEST_ALARM)
                 .severity(AlarmSeverity.CRITICAL).status(AlarmStatus.ACTIVE_UNACK)
                 .startTs(System.currentTimeMillis()).build();
-        alarm = alarmService.createOrUpdateAlarm(alarm).getAlarm();
+        alarm = new Alarm(alarmService.createOrUpdateAlarm(alarm).getAlarmInfo());
 
         user = new User();
         user.setAuthority(Authority.TENANT_ADMIN);