diff --git a/ui-ngx/src/app/modules/home/components/calculated-fields/components/geofencing-configuration/calculated-field-geofencing-zone-groups-panel.component.html b/ui-ngx/src/app/modules/home/components/calculated-fields/components/geofencing-configuration/calculated-field-geofencing-zone-groups-panel.component.html
index 2f370baa0f..8ffad9f9c9 100644
--- a/ui-ngx/src/app/modules/home/components/calculated-fields/components/geofencing-configuration/calculated-field-geofencing-zone-groups-panel.component.html
+++ b/ui-ngx/src/app/modules/home/components/calculated-fields/components/geofencing-configuration/calculated-field-geofencing-zone-groups-panel.component.html
@@ -112,7 +112,7 @@
                      cdkDropList cdkDropListOrientation="vertical"
                      [cdkDropListDisabled]="!dragEnabled"
                      (cdkDropListDropped)="keyDrop($event)">
-                  @for (keyControl of levelsFormArray().controls; track keyControl; ) {
+                  @for (keyControl of levelsFormArray().controls; track keyControl) {
                     <div cdkDrag [cdkDragDisabled]="!dragEnabled" class="tb-draggable-form-table-row">
                       <div class="tb-form-table-row-cell-buttons">
                         <button mat-icon-button
diff --git a/ui-ngx/src/app/modules/home/components/profile/alarm/device-profile-alarms.component.html b/ui-ngx/src/app/modules/home/components/profile/alarm/device-profile-alarms.component.html
index 84439e010c..2d07655784 100644
--- a/ui-ngx/src/app/modules/home/components/profile/alarm/device-profile-alarms.component.html
+++ b/ui-ngx/src/app/modules/home/components/profile/alarm/device-profile-alarms.component.html
@@ -17,7 +17,7 @@
 -->
 <div class="flex flex-col">
   <div class="tb-device-profile-alarms">
-    @for (alarmControl of alarmsFormArray.controls; track alarmControl; let isLast = $last) {
+    @for (alarmControl of alarmsFormArray.controls; track alarmControl.value.id; let isLast = $last) {
       <div
         class="flex flex-col" [class.pb-2]="!isLast">
         <tb-device-profile-alarm [formControl]="alarmControl"
diff --git a/ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-observe-attr-telemetry-instances.component.html b/ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-observe-attr-telemetry-instances.component.html
index 7e068a7a1e..8e164ba5a8 100644
--- a/ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-observe-attr-telemetry-instances.component.html
+++ b/ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-observe-attr-telemetry-instances.component.html
@@ -17,7 +17,7 @@
 -->
 <section [formGroup]="instancesFormGroup">
   <mat-accordion multi="true" formArrayName="instances">
-    @for (instances of instancesFormArray.controls; track instances) {
+    @for (instances of instancesFormArray.controls; track instances.value.id) {
       <mat-expansion-panel
         class="instance-row"
         [formGroupName]="$index"
diff --git a/ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-observe-attr-telemetry-resources.component.html b/ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-observe-attr-telemetry-resources.component.html
index f7ca2f089b..7c27ba85ce 100644
--- a/ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-observe-attr-telemetry-resources.component.html
+++ b/ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-observe-attr-telemetry-resources.component.html
@@ -35,7 +35,7 @@
   </div>
   <mat-divider></mat-divider>
   <div formArrayName="resources">
-    @for (resourceLwM2M of resourcesFormArray.controls; track resourceLwM2M) {
+    @for (resourceLwM2M of resourcesFormArray.controls; track resourceLwM2M.value.id) {
       <div [formGroupName]="$index" class="resource-list flex flex-row items-center justify-start">
         <div class="resource-name max-w-30% flex-full">
           #{{ resourceLwM2M.get('id').value }} <span class="name">{{ resourceLwM2M.get('name').value }}</span>
diff --git a/ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-observe-attr-telemetry.component.html b/ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-observe-attr-telemetry.component.html
index 0b9c33e4a1..40a42f9122 100644
--- a/ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-observe-attr-telemetry.component.html
+++ b/ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-observe-attr-telemetry.component.html
@@ -17,7 +17,7 @@
 -->
 <section [formGroup]="modelsFormGroup">
   <mat-accordion multi="true" formArrayName="models">
-    @for (objectLwM2M of modelsFormArray.controls; track objectLwM2M) {
+    @for (objectLwM2M of modelsFormArray.controls; track objectLwM2M.value.id) {
       <mat-expansion-panel [formGroupName]="$index">
         <mat-expansion-panel-header>
           <mat-panel-title class="flex items-center justify-start">
diff --git a/ui-ngx/src/app/modules/home/components/profile/queue/tenant-profile-queues.component.html b/ui-ngx/src/app/modules/home/components/profile/queue/tenant-profile-queues.component.html
index 344583e4bc..f4d1298267 100644
--- a/ui-ngx/src/app/modules/home/components/profile/queue/tenant-profile-queues.component.html
+++ b/ui-ngx/src/app/modules/home/components/profile/queue/tenant-profile-queues.component.html
@@ -16,7 +16,7 @@
 
 -->
 <div class="flex flex-col">
-  @for (queuesControl of queuesFormArray.controls; track queuesControl; let isLast = $last) {
+  @for (queuesControl of queuesFormArray.controls; track queuesControl.value.id; let isLast = $last) {
     <div class="tb-tenant-profile-queues"
          [class.pb-2]="!isLast">
       <mat-expansion-panel class="flex-1" [expanded]="true">
diff --git a/ui-ngx/src/app/modules/home/components/profile/queue/tenant-profile-queues.component.ts b/ui-ngx/src/app/modules/home/components/profile/queue/tenant-profile-queues.component.ts
index 9182c429d2..5a7d886b56 100644
--- a/ui-ngx/src/app/modules/home/components/profile/queue/tenant-profile-queues.component.ts
+++ b/ui-ngx/src/app/modules/home/components/profile/queue/tenant-profile-queues.component.ts
@@ -141,7 +141,6 @@ export class TenantProfileQueuesComponent implements ControlValueAccessor, Valid
     }
   }
 
-
   public removeQueue(index: number) {
     (this.tenantProfileQueuesFormGroup.get('queues') as UntypedFormArray).removeAt(index);
     this.idMap.splice(index, 1);
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/alarm/alarms-table-widget.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/alarm/alarms-table-widget.component.html
index b1d3ed615b..0ac56423a9 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/alarm/alarms-table-widget.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/alarm/alarms-table-widget.component.html
@@ -142,7 +142,7 @@
             @if (alarmsDatasource.countCellButtonAction) {
               <div [class.lt-lg:!hidden]="showCellActionsMenu && alarmsDatasource.countCellButtonAction !== 1" class="flex flex-row items-stretch justify-end"
                    [style.min-width]="(alarmsDatasource.countCellButtonAction * 48) + 'px'">
-                @for (actionDescriptor of alarm.actionCellButtons; track actionDescriptor) {
+                @for (actionDescriptor of alarm.actionCellButtons; track actionDescriptor.id) {
                   @if (!actionDescriptor.icon) {
                     <span style="width: 48px;"></span>
                   }
@@ -164,7 +164,7 @@
                     <mat-icon class="material-icons">more_vert</mat-icon>
                   </button>
                   <mat-menu #cellActionsMenu="matMenu" xPosition="before">
-                    @for (actionDescriptor of alarm.actionCellButtons; track actionDescriptor) {
+                    @for (actionDescriptor of alarm.actionCellButtons; track actionDescriptor.id) {
                       @if (actionDescriptor.icon) {
                         <button mat-menu-item
                                 [disabled]="(isLoading$ | async) || !actionEnabled(alarm, actionDescriptor)"
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/entity/entities-table-widget.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/entity/entities-table-widget.component.html
index 432ac5258b..0a02b17e4d 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/entity/entities-table-widget.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/entity/entities-table-widget.component.html
@@ -65,7 +65,7 @@
             @if (entityDatasource.countCellButtonAction) {
               <div [class.lt-lg:!hidden]="showCellActionsMenu && entityDatasource.countCellButtonAction !== 1" class="flex flex-row items-stretch justify-end"
                    [style.min-width]="(entityDatasource.countCellButtonAction * 48) + 'px'">
-                @for (actionDescriptor of entity.actionCellButtons; track actionDescriptor) {
+                @for (actionDescriptor of entity.actionCellButtons; track actionDescriptor.id) {
                   @if (!actionDescriptor.icon) {
                     <span style="width: 48px;"></span>
                   }
@@ -87,7 +87,7 @@
                     <mat-icon class="material-icons">more_vert</mat-icon>
                   </button>
                   <mat-menu #cellActionsMenu="matMenu" xPosition="before">
-                    @for (actionDescriptor of entity.actionCellButtons; track actionDescriptor) {
+                    @for (actionDescriptor of entity.actionCellButtons; track actionDescriptor.id) {
                       @if (actionDescriptor.icon) {
                         <button mat-menu-item
                                 (click)="onActionButtonClick($event, entity, actionDescriptor)">
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/timeseries-table-widget.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/timeseries-table-widget.component.html
index 04c837694e..f6eb022e6b 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/timeseries-table-widget.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/timeseries-table-widget.component.html
@@ -79,7 +79,7 @@
                     @if (source.timeseriesDatasource.countCellButtonAction) {
                       <div [class.lt-lg:!hidden]="showCellActionsMenu && source.timeseriesDatasource.countCellButtonAction !== 1" class="flex flex-row items-stretch justify-end"
                            [style.min-width]="(source.timeseriesDatasource.countCellButtonAction * 40) + 'px'">
-                        @for (actionDescriptor of row.actionCellButtons; track actionDescriptor) {
+                        @for (actionDescriptor of row.actionCellButtons; track actionDescriptor.id) {
                           @if (!actionDescriptor.icon) {
                             <span style="width: 40px;"></span>
                           }
@@ -104,7 +104,7 @@
                             <mat-icon class="material-icons">more_vert</mat-icon>
                           </button>
                           <mat-menu #cellActionsMenu="matMenu" xPosition="before">
-                            @for (actionDescriptor of row.actionCellButtons; track actionDescriptor) {
+                            @for (actionDescriptor of row.actionCellButtons; track actionDescriptor.id) {
                               @if (actionDescriptor.icon) {
                                 <button mat-menu-item
                                         (click)="onActionButtonClick($event, row, actionDescriptor)">
diff --git a/ui-ngx/src/app/modules/home/pages/mobile/bundes/layout/mobile-layout.component.html b/ui-ngx/src/app/modules/home/pages/mobile/bundes/layout/mobile-layout.component.html
index 30b9aef5e1..6183512cc6 100644
--- a/ui-ngx/src/app/modules/home/pages/mobile/bundes/layout/mobile-layout.component.html
+++ b/ui-ngx/src/app/modules/home/pages/mobile/bundes/layout/mobile-layout.component.html
@@ -61,7 +61,7 @@
        cdkDropListOrientation="vertical"
        (cdkDropListDropped)="mobileItemDrop($event)"
        [cdkDropListDisabled]="!dragEnabled">
-    @for (menuItemControl of visibleMobilePagesControls(); track menuItemControl;) {
+    @for (menuItemControl of visibleMobilePagesControls(); track menuItemControl) {
       <div class="tb-mobile-item-row-container">
         <div cdkDrag [cdkDragDisabled]="!dragEnabled"
              class="tb-draggable tb-mobile-item-row">