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 4771bad716..2a5dea70ac 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
@@ -94,6 +94,6 @@ public class TbAlarmCountSubCtx extends TbAbstractEntityQuerySubCtx<AlarmCountQu
     private EntityDataQuery buildEntityDataQuery() {
         EntityDataPageLink edpl = new EntityDataPageLink(maxEntitiesPerAlarmSubscription, 0, null,
                 new EntityDataSortOrder(new EntityKey(EntityKeyType.ENTITY_FIELD, ModelConstants.CREATED_TIME_PROPERTY)));
-        return new EntityDataQuery(query.getEntityFilter(), edpl, null, null, null);
+        return new EntityDataQuery(query.getEntityFilter(), edpl, null, null, query.getKeyFilters());
     }
 }
diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/alarm/alarm-count-basic-config.component.html b/ui-ngx/src/app/modules/home/components/widget/config/basic/alarm/alarm-count-basic-config.component.html
index b2a81420e5..a25cc22031 100644
--- a/ui-ngx/src/app/modules/home/components/widget/config/basic/alarm/alarm-count-basic-config.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/alarm/alarm-count-basic-config.component.html
@@ -16,6 +16,15 @@
 
 -->
 <ng-container [formGroup]="alarmCountWidgetConfigForm">
+  <tb-datasources
+    [configMode]="basicMode"
+    hideDatasourcesMode
+    hideDatasourceLabel
+    hideDataKeys
+    hideAlarmFilter
+    displayDatasourceFilterForBasicMode
+    formControlName="datasources">
+  </tb-datasources>
   <div class="tb-form-panel">
     <div class="flex flex-row items-center justify-between">
       <div class="tb-form-panel-title" translate>alarm.filter</div>
diff --git a/ui-ngx/src/app/modules/home/components/widget/config/basic/alarm/alarm-count-basic-config.component.ts b/ui-ngx/src/app/modules/home/components/widget/config/basic/alarm/alarm-count-basic-config.component.ts
index 4ad664fae3..d365ed3f2d 100644
--- a/ui-ngx/src/app/modules/home/components/widget/config/basic/alarm/alarm-count-basic-config.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/config/basic/alarm/alarm-count-basic-config.component.ts
@@ -69,6 +69,7 @@ export class AlarmCountBasicConfigComponent extends BasicWidgetConfigComponent {
     const settings: CountWidgetSettings = {...countDefaultSettings(true), ...(configData.config.settings || {})};
     this.alarmCountWidgetConfigForm = this.fb.group({
       alarmFilterConfig: [getAlarmFilterConfig(configData.config.datasources), []],
+      datasources: [configData.config.datasources, []],
 
       settings: [settings, []],
 
@@ -81,6 +82,7 @@ export class AlarmCountBasicConfigComponent extends BasicWidgetConfigComponent {
   }
 
   protected prepareOutputConfig(config: any): WidgetConfigComponentData {
+    this.widgetConfig.config.datasources = config.datasources;
     setAlarmFilterConfig(config.alarmFilterConfig, this.widgetConfig.config.datasources);
 
     this.widgetConfig.config.settings = {...(this.widgetConfig.config.settings || {}), ...config.settings};
diff --git a/ui-ngx/src/app/modules/home/components/widget/config/datasource.component.html b/ui-ngx/src/app/modules/home/components/widget/config/datasource.component.html
index 8af7753525..6c5c5cf083 100644
--- a/ui-ngx/src/app/modules/home/components/widget/config/datasource.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/config/datasource.component.html
@@ -36,7 +36,7 @@
                                  datasourceFormGroup.get('type').value === datasourceType.entity ||
                                  datasourceFormGroup.get('type').value === datasourceType.entityCount ||
                                  datasourceFormGroup.get('type').value === datasourceType.alarmCount ? datasourceFormGroup.get('type').value : ''">
-      <tb-alarm-filter-config *ngIf="datasourceFormGroup.get('type').value === datasourceType.alarmCount"
+      <tb-alarm-filter-config *ngIf="datasourceFormGroup.get('type').value === datasourceType.alarmCount && !hideAlarmFilter"
                               propagatedFilter="false"
                               [initialAlarmFilterConfig]="{ statusList: [alarmSearchStatus.ACTIVE] }"
                               style="height: 56px; margin-bottom: 22px;"
@@ -47,9 +47,9 @@
                               formControlName="deviceId">
       </tb-entity-autocomplete>
       <tb-entity-alias-select
-        *ngIf="datasourceFormGroup.get('type').value !== datasourceType.device && datasourceFormGroup.get('type').value !== datasourceType.alarmCount"
+        *ngIf="datasourceFormGroup.get('type').value !== datasourceType.device"
         [showLabel]="true"
-        [tbRequired]="!datasourcesOptional"
+        [tbRequired]="!entityAliasOptional"
         [aliasController]="aliasController"
         formControlName="entityAliasId"
         [callbacks]="entityAliasSelectCallbacks">
@@ -98,7 +98,7 @@
     </tb-data-keys>
   </section>
   <tb-filter-select
-    *ngIf="(!basicMode || displayDatasourceFilterForBasicMode) && ![datasourceType.function, datasourceType.alarmCount].includes(datasourceFormGroup.get('type').value)"
+    *ngIf="(!basicMode || displayDatasourceFilterForBasicMode) && ![datasourceType.function].includes(datasourceFormGroup.get('type').value)"
     [showLabel]="true"
     [aliasController]="aliasController"
     formControlName="filterId"
diff --git a/ui-ngx/src/app/modules/home/components/widget/config/datasource.component.ts b/ui-ngx/src/app/modules/home/components/widget/config/datasource.component.ts
index b62f462576..01b62355e2 100644
--- a/ui-ngx/src/app/modules/home/components/widget/config/datasource.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/config/datasource.component.ts
@@ -106,6 +106,11 @@ export class DatasourceComponent implements ControlValueAccessor, OnInit, Valida
     return this.widgetConfigComponent.modelValue?.typeParameters?.datasourcesOptional;
   }
 
+  public get entityAliasOptional(): boolean {
+    const type: DatasourceType = this.datasourceFormGroup.get('type').value;
+    return this.datasourcesOptional || type === DatasourceType.alarmCount
+  }
+
   public get maxDataKeys(): number {
     return this.widgetConfigComponent.modelValue?.typeParameters?.maxDataKeys;
   }
@@ -170,6 +175,10 @@ export class DatasourceComponent implements ControlValueAccessor, OnInit, Valida
     return this.datasourcesComponent?.hideLatestDataKeys;
   }
 
+  public get hideAlarmFilter(): boolean {
+    return this.datasourcesComponent?.hideAlarmFilter;
+  }
+
   @Input()
   disabled: boolean;
 
diff --git a/ui-ngx/src/app/modules/home/components/widget/config/datasources.component.ts b/ui-ngx/src/app/modules/home/components/widget/config/datasources.component.ts
index 65f46240c8..163b4ea824 100644
--- a/ui-ngx/src/app/modules/home/components/widget/config/datasources.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/config/datasources.component.ts
@@ -131,6 +131,10 @@ export class DatasourcesComponent implements ControlValueAccessor, OnInit, Valid
   @coerceBoolean()
   hideLatestDataKeys = false;
 
+  @Input()
+  @coerceBoolean()
+  hideAlarmFilter = false;
+
   @Input()
   @coerceBoolean()
   forceSingleDatasource = false;