From 82fc91f113b40ac492534ff61152427ddbb85e57 Mon Sep 17 00:00:00 2001
From: dashevchenko <dshevchenko@thingsboard.io>
Date: Thu, 4 Dec 2025 12:50:59 +0200
Subject: [PATCH] refactoring

---
 .../server/service/subscription/TbAlarmStatusSubCtx.java       | 3 +++
 .../server/service/subscription/TbAlarmStatusSubscription.java | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/application/src/main/java/org/thingsboard/server/service/subscription/TbAlarmStatusSubCtx.java b/application/src/main/java/org/thingsboard/server/service/subscription/TbAlarmStatusSubCtx.java
index b3cd136726..6b3d38e8eb 100644
--- a/application/src/main/java/org/thingsboard/server/service/subscription/TbAlarmStatusSubCtx.java
+++ b/application/src/main/java/org/thingsboard/server/service/subscription/TbAlarmStatusSubCtx.java
@@ -95,6 +95,9 @@ public class TbAlarmStatusSubCtx extends TbAbstractSubCtx {
     private void handleAlarmStatusSubscriptionUpdate(TbSubscription<AlarmSubscriptionUpdate> sub, AlarmSubscriptionUpdate subscriptionUpdate) {
         try {
             AlarmInfo alarm = subscriptionUpdate.getAlarm();
+            if (!alarm.getOriginator().equals(subscription.getEntityId())) {
+                return;
+            }
             Set<UUID> alarmsIds = subscription.getAlarmIds();
             if (alarmsIds.contains(alarm.getId().getId())) {
                 if (!subscription.matches(alarm) || subscriptionUpdate.isAlarmDeleted()) {
diff --git a/application/src/main/java/org/thingsboard/server/service/subscription/TbAlarmStatusSubscription.java b/application/src/main/java/org/thingsboard/server/service/subscription/TbAlarmStatusSubscription.java
index e1b5d2ddfa..524ce37834 100644
--- a/application/src/main/java/org/thingsboard/server/service/subscription/TbAlarmStatusSubscription.java
+++ b/application/src/main/java/org/thingsboard/server/service/subscription/TbAlarmStatusSubscription.java
@@ -53,7 +53,7 @@ public class TbAlarmStatusSubscription extends TbSubscription<AlarmSubscriptionU
     }
 
     public boolean matches(AlarmInfo alarm) {
-        return alarm.getOriginator().equals(getEntityId()) && !alarm.isCleared() && (this.typeList == null || this.typeList.contains(alarm.getType())) &&
+        return !alarm.isCleared() && (this.typeList == null || this.typeList.contains(alarm.getType())) &&
                 (this.severityList == null || this.severityList.contains(alarm.getSeverity()));
     }