diff --git a/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/alarm/AlarmCalculatedFieldState.java b/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/alarm/AlarmCalculatedFieldState.java
index c140ba78af..61d55f376f 100644
--- a/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/alarm/AlarmCalculatedFieldState.java
+++ b/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/alarm/AlarmCalculatedFieldState.java
@@ -223,6 +223,9 @@ public class AlarmCalculatedFieldState extends BaseCalculatedFieldState {
     private void processAlarmClear(Alarm alarm) {
         currentAlarm = null;
         createRuleStates.values().forEach(AlarmRuleState::clear);
+        createRuleStates.clear();
+        clearState(clearRuleState);
+        clearRuleState = null;
     }
 
     private void processAlarmAck(Alarm alarm) {
@@ -231,8 +234,7 @@ public class AlarmCalculatedFieldState extends BaseCalculatedFieldState {
     }
 
     private void processAlarmDelete(Alarm alarm) {
-        currentAlarm = null;
-        createRuleStates.values().forEach(AlarmRuleState::clear);
+        processAlarmClear(alarm);
     }
 
     private TbAlarmResult createOrClearAlarms(Function<AlarmRuleState, AlarmEvalResult> evalFunction,
diff --git a/common/data/src/test/java/org/thingsboard/server/common/data/msg/TbMsgTypeTest.java b/common/data/src/test/java/org/thingsboard/server/common/data/msg/TbMsgTypeTest.java
index 563c6015ef..54238c8751 100644
--- a/common/data/src/test/java/org/thingsboard/server/common/data/msg/TbMsgTypeTest.java
+++ b/common/data/src/test/java/org/thingsboard/server/common/data/msg/TbMsgTypeTest.java
@@ -20,7 +20,6 @@ import org.junit.jupiter.api.Test;
 import java.util.List;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.thingsboard.server.common.data.msg.TbMsgType.ALARM;
 import static org.thingsboard.server.common.data.msg.TbMsgType.ALARM_DELETE;
 import static org.thingsboard.server.common.data.msg.TbMsgType.DEDUPLICATION_TIMEOUT_SELF_MSG;
 import static org.thingsboard.server.common.data.msg.TbMsgType.DELAY_TIMEOUT_SELF_MSG;
@@ -39,7 +38,6 @@ import static org.thingsboard.server.common.data.msg.TbMsgType.SEND_EMAIL;
 class TbMsgTypeTest {
 
     private static final List<TbMsgType> typesWithNullRuleNodeConnection = List.of(
-            ALARM,
             ALARM_DELETE,
             ENTITY_ASSIGNED_TO_EDGE,
             ENTITY_UNASSIGNED_FROM_EDGE,