From ce69271d3742c331fc830ba06cad7c436f403e41 Mon Sep 17 00:00:00 2001
From: Maksym Tsymbarov <mtsymbarov@thingsboard.io>
Date: Fri, 15 May 2026 10:26:34 +0200
Subject: [PATCH] Fixed reset pagination for alarms table

---
 .../widget/lib/alarm/alarms-table-widget.component.ts    | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/alarm/alarms-table-widget.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/alarm/alarms-table-widget.component.ts
index 06e0cb73ad..b3ffc0d163 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/alarm/alarms-table-widget.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/alarm/alarms-table-widget.component.ts
@@ -324,6 +324,15 @@ export class AlarmsTableWidgetComponent extends PageComponent implements OnInit,
     if (this.displayPagination) {
       this.sort.sortChange.pipe(takeUntil(this.destroy$)).subscribe(() => this.paginator.pageIndex = 0);
 
+      this.ctx.aliasController?.entityAliasesChanged.pipe(
+        takeUntil(this.destroy$)
+      ).subscribe((aliasIds) => {
+        let currentEntityAliasId = this.ctx.defaultSubscription.options.alarmSource?.entityAliasId;
+        if (currentEntityAliasId && aliasIds.includes(currentEntityAliasId)) {
+          this.paginator.firstPage();
+        }
+      });
+
       this.ctx.aliasController?.filtersChanged.pipe(
         takeUntil(this.destroy$)
       ).subscribe((filters) => {