diff --git a/ui-ngx/src/app/modules/home/pages/admin/oauth2-settings.component.html b/ui-ngx/src/app/modules/home/pages/admin/oauth2-settings.component.html
index bc5ffd3ae5..7cc06bc4af 100644
--- a/ui-ngx/src/app/modules/home/pages/admin/oauth2-settings.component.html
+++ b/ui-ngx/src/app/modules/home/pages/admin/oauth2-settings.component.html
@@ -37,7 +37,7 @@
             <ng-container formArrayName="oauth2ParamsInfos">
               <div class="container">
                 <mat-accordion multi>
-                  <ng-container *ngFor="let oauth2ParamsInfo of oauth2ParamsInfos.controls; let i = index; trackBy: trackByParams">
+                  <ng-container *ngFor="let oauth2ParamsInfo of oauth2ParamsInfos.controls; let i = index; trackBy: trackByItem">
                     <mat-expansion-panel [formGroupName]="i">
                       <mat-expansion-panel-header>
                         <mat-panel-title fxLayoutAlign="start center">
@@ -59,7 +59,7 @@
                           <mat-tab label="{{ 'admin.oauth2.domains' | translate }}">
                             <ng-container formArrayName="domainInfos">
                               <div style="padding-top: 16px;"></div>
-                              <section *ngFor="let domainInfo of domainInfos(oauth2ParamsInfo).controls; let n = index; trackBy: trackByParams"
+                              <section *ngFor="let domainInfo of domainInfos(oauth2ParamsInfo).controls; let n = index; trackBy: trackByItem"
                                        class="domains-list">
                                 <div [formGroupName]="n" fxLayout="row" fxLayoutGap="8px">
                                   <div fxFlex fxLayout="row" fxLayout.xs="column" fxLayoutGap="8px">
@@ -146,7 +146,7 @@
                                   <span fxLayoutAlign="center center"
                                           class="tb-prompt" translate>admin.oauth2.no-mobile-apps</span>
                               </div>
-                              <section *ngFor="let mobileInfo of mobileInfos(oauth2ParamsInfo).controls; let n = index; trackBy: trackByParams"
+                              <section *ngFor="let mobileInfo of mobileInfos(oauth2ParamsInfo).controls; let n = index; trackBy: trackByItem"
                                        class="apps-list">
                                 <div [formGroupName]="n" fxLayout="row" fxLayoutGap="8px">
                                   <div fxFlex fxLayout="row" fxLayout.xs="column" fxLayoutGap="8px">
@@ -203,7 +203,7 @@
                         <div class="mat-h3" translate>admin.oauth2.providers</div>
                         <ng-container formArrayName="clientRegistrations">
                           <div class="container">
-                            <mat-expansion-panel *ngFor="let registration of clientRegistrations(oauth2ParamsInfo).controls; let j = index; trackBy: trackByParams"
+                            <mat-expansion-panel *ngFor="let registration of clientRegistrations(oauth2ParamsInfo).controls; let j = index; trackBy: trackByItem"
                               class="registration-card mat-elevation-z0">
                               <mat-expansion-panel-header>
                                 <mat-panel-title fxLayoutAlign="start center">
diff --git a/ui-ngx/src/app/modules/home/pages/admin/oauth2-settings.component.ts b/ui-ngx/src/app/modules/home/pages/admin/oauth2-settings.component.ts
index 34f35611b4..d274f6728e 100644
--- a/ui-ngx/src/app/modules/home/pages/admin/oauth2-settings.component.ts
+++ b/ui-ngx/src/app/modules/home/pages/admin/oauth2-settings.component.ts
@@ -570,4 +570,8 @@ export class OAuth2SettingsComponent extends PageComponent implements OnInit, Ha
   trackByParams(index: number): number {
     return index;
   }
+
+  trackByItem(i, item) {
+    return item;
+  }
 }