diff --git a/application/src/main/java/org/thingsboard/server/service/subscription/TbAlarmCountSubCtx.java b/application/src/main/java/org/thingsboard/server/service/subscription/TbAlarmCountSubCtx.java
index 8425b2a57a..4771bad716 100644
--- a/application/src/main/java/org/thingsboard/server/service/subscription/TbAlarmCountSubCtx.java
+++ b/application/src/main/java/org/thingsboard/server/service/subscription/TbAlarmCountSubCtx.java
@@ -80,14 +80,15 @@ public class TbAlarmCountSubCtx extends TbAbstractEntityQuerySubCtx<AlarmCountQu
     }
 
     private int countAlarms() {
-        PageData<EntityData> data = entityService.findEntityDataByQuery(getTenantId(), getCustomerId(), buildEntityDataQuery());
-        List<EntityId> entityIds = data.getData().stream().map(EntityData::getEntityId).toList();
-        if (entityIds.isEmpty()) {
-            return 0;
-        } else {
-            return (int) alarmService.countAlarmsByQuery(getTenantId(), getCustomerId(), query, entityIds);
+        List<EntityId> entityIds = null;
+        if (query.getEntityFilter() != null) {
+            PageData<EntityData> data = entityService.findEntityDataByQuery(getTenantId(), getCustomerId(), buildEntityDataQuery());
+            if (data.getData().isEmpty()) {
+                return 0;
+            }
+            entityIds = data.getData().stream().map(EntityData::getEntityId).toList();
         }
-
+        return (int) alarmService.countAlarmsByQuery(getTenantId(), getCustomerId(), query, entityIds);
     }
 
     private EntityDataQuery buildEntityDataQuery() {
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/query/AlarmCountQuery.java b/common/data/src/main/java/org/thingsboard/server/common/data/query/AlarmCountQuery.java
index bb969a28ce..1bf19a970f 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/query/AlarmCountQuery.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/query/AlarmCountQuery.java
@@ -17,9 +17,8 @@ package org.thingsboard.server.common.data.query;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
-import lombok.Getter;
+import lombok.Data;
 import lombok.NoArgsConstructor;
-import lombok.Setter;
 import lombok.ToString;
 import org.thingsboard.server.common.data.alarm.AlarmSearchStatus;
 import org.thingsboard.server.common.data.alarm.AlarmSeverity;
@@ -30,8 +29,7 @@ import java.util.List;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-@Getter
-@Setter
+@Data
 @ToString
 public class AlarmCountQuery extends EntityCountQuery {
     private long startTs;
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/query/EntityCountQuery.java b/common/data/src/main/java/org/thingsboard/server/common/data/query/EntityCountQuery.java
index be9fa4c664..3dd24147e7 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/query/EntityCountQuery.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/query/EntityCountQuery.java
@@ -27,7 +27,7 @@ import java.util.List;
 public class EntityCountQuery {
 
     @Getter
-    protected EntityFilter entityFilter;
+    private EntityFilter entityFilter;
 
     @Getter
     protected List<KeyFilter> keyFilters;
diff --git a/dao/src/main/java/org/thingsboard/server/dao/alarm/BaseAlarmService.java b/dao/src/main/java/org/thingsboard/server/dao/alarm/BaseAlarmService.java
index 14cd65185d..b8a57fdcff 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/alarm/BaseAlarmService.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/alarm/BaseAlarmService.java
@@ -351,8 +351,7 @@ public class BaseAlarmService extends AbstractCachedEntityService<TenantId, Page
 
     @Override
     public long countAlarmsByQuery(TenantId tenantId, CustomerId customerId, AlarmCountQuery query) {
-        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
-        return alarmDao.countAlarmsByQuery(tenantId, customerId, query, Collections.emptyList());
+        return countAlarmsByQuery(tenantId, customerId, query, null);
     }
 
     @Override
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/query/DefaultAlarmQueryRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/query/DefaultAlarmQueryRepository.java
index b4cc40fc6d..216fd0d2d4 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/query/DefaultAlarmQueryRepository.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/query/DefaultAlarmQueryRepository.java
@@ -327,7 +327,7 @@ public class DefaultAlarmQueryRepository implements AlarmQueryRepository {
                 ctx.append(" and a.customer_id = :customerId and ea.customer_id = :customerId");
                 ctx.addUuidParameter("customerId", customerId.getId());
             }
-            if (!orderedEntityIds.isEmpty()) {
+            if (orderedEntityIds != null) {
                 ctx.addUuidListParameter("entity_filter_entity_ids", orderedEntityIds.stream().map(EntityId::getId).collect(Collectors.toList()));
                 ctx.append(" and ea.entity_id in (:entity_filter_entity_ids)");
             }
@@ -339,7 +339,7 @@ public class DefaultAlarmQueryRepository implements AlarmQueryRepository {
                 ctx.append(" and a.customer_id = :customerId");
                 ctx.addUuidParameter("customerId", customerId.getId());
             }
-            if (!orderedEntityIds.isEmpty()) {
+            if (orderedEntityIds != null) {
                 ctx.addUuidListParameter("entity_filter_entity_ids", orderedEntityIds.stream().map(EntityId::getId).collect(Collectors.toList()));
                 ctx.append(" and a.originator_id in (:entity_filter_entity_ids)");
             }