diff --git a/mediarepo-ui/src/app/components/core/core.component.html b/mediarepo-ui/src/app/components/core/core.component.html
index 68c2a53..f2a5fea 100644
--- a/mediarepo-ui/src/app/components/core/core.component.html
+++ b/mediarepo-ui/src/app/components/core/core.component.html
@@ -4,7 +4,7 @@
         <mat-tab [label]="this.selectedRepository? 'RepositoryData' : 'Repositories'">
             <app-repositories-tab></app-repositories-tab>
         </mat-tab>
-        <mat-tab *ngFor="let tab of tabs">
+        <mat-tab *ngFor="let tab of tabs; trackBy: trackByTabId">
             <ng-template mat-tab-label>
                 <div (click)="this.onMouseClickTabLabel(tab, $event)" class="tab-label-div">
                     {{tab.category}}
diff --git a/mediarepo-ui/src/app/components/core/core.component.ts b/mediarepo-ui/src/app/components/core/core.component.ts
index 79d3b93..6b07685 100644
--- a/mediarepo-ui/src/app/components/core/core.component.ts
+++ b/mediarepo-ui/src/app/components/core/core.component.ts
@@ -27,7 +27,8 @@ export class CoreComponent {
         private tabService: TabService,
         private repoService: RepositoryService,
         private stateService: StateService,
-        private tagService: TagService) {
+        private tagService: TagService
+    ) {
         this.selectedRepository = this.repoService.selectedRepository.getValue();
 
         this.repoService.selectedRepository.subscribe(async (selected) => {
@@ -114,4 +115,8 @@ export class CoreComponent {
             await this.closeTab(tab);
         }
     }
+
+    public trackByTabId(index: number, item: TabState) {
+        return item.uuid;
+    }
 }