diff --git a/modules/ui/src/app/pages/risk-assessment/risk-assessment.component.html b/modules/ui/src/app/pages/risk-assessment/risk-assessment.component.html
index af1bbd8a4..0a72e6f70 100644
--- a/modules/ui/src/app/pages/risk-assessment/risk-assessment.component.html
+++ b/modules/ui/src/app/pages/risk-assessment/risk-assessment.component.html
@@ -42,11 +42,7 @@ <h2 class="profiles-drawer-header-title">Saved profiles</h2>
     </div>
     <div class="profiles-drawer-content">
       <app-profile-item
-        *ngFor="
-          let profile of vm.profiles;
-          let i = index;
-          trackBy: trackByIndex
-        "
+        *ngFor="let profile of vm.profiles; let i = index; trackBy: trackByName"
         [profile]="profile"
         class="profile-item-{{ i }}"
         [ngClass]="{ selected: profile.name === vm.selectedProfile?.name }"
diff --git a/modules/ui/src/app/pages/risk-assessment/risk-assessment.component.ts b/modules/ui/src/app/pages/risk-assessment/risk-assessment.component.ts
index 1f703f81f..0b895f693 100644
--- a/modules/ui/src/app/pages/risk-assessment/risk-assessment.component.ts
+++ b/modules/ui/src/app/pages/risk-assessment/risk-assessment.component.ts
@@ -140,8 +140,8 @@ export class RiskAssessmentComponent implements OnInit, OnDestroy {
     }
   }
 
-  trackByIndex = (index: number): number => {
-    return index;
+  trackByName = (index: number, item: Profile): string => {
+    return item.name;
   };
 
   private closeFormAfterDelete(name: string, selectedProfile: Profile | null) {