diff --git a/src/app/modules/admin/apps/academy/details/details.component.html b/src/app/modules/admin/apps/academy/details/details.component.html
index 2707e992..52aa9125 100644
--- a/src/app/modules/admin/apps/academy/details/details.component.html
+++ b/src/app/modules/admin/apps/academy/details/details.component.html
@@ -47,7 +47,7 @@
             <!-- Steps -->
             <div class="py-2 px-8">
                 <ol>
-                    <ng-container *ngFor="let step of course.steps; let last = last">
+                    <ng-container *ngFor="let step of course.steps; let last = last; trackBy: trackByFn">
                         <li class="relative group py-6"
                             [class.current-step]="step.order === currentStep">
                             <ng-container *ngIf="!last">
@@ -120,7 +120,7 @@
                     class="fuse-mat-no-header"
                     [animationDuration]="'200'"
                     #courseSteps>
-                    <ng-container *ngFor="let step of course.steps">
+                    <ng-container *ngFor="let step of course.steps; trackBy: trackByFn">
                         <mat-tab>
                             <ng-template matTabContent>
                                 <div
diff --git a/src/app/modules/admin/apps/academy/list/list.component.html b/src/app/modules/admin/apps/academy/list/list.component.html
index aaa9953d..535007e4 100644
--- a/src/app/modules/admin/apps/academy/list/list.component.html
+++ b/src/app/modules/admin/apps/academy/list/list.component.html
@@ -36,7 +36,7 @@
                         [value]="'all'"
                         (selectionChange)="filterByCategory($event)">
                         <mat-option [value]="'all'">All</mat-option>
-                        <ng-container *ngFor="let category of categories">
+                        <ng-container *ngFor="let category of categories; trackBy: trackByFn">
                             <mat-option [value]="category.slug">{{category.title}}</mat-option>
                         </ng-container>
                     </mat-select>
@@ -64,7 +64,7 @@
             <!-- Courses -->
             <ng-container *ngIf="this.filteredCourses.length; else noCourses">
                 <div class="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-8 mt-8 sm:mt-10">
-                    <ng-container *ngFor="let course of filteredCourses">
+                    <ng-container *ngFor="let course of filteredCourses; trackBy: trackByFn">
                         <!-- Course -->
                         <div class="flex flex-col h-96 shadow rounded-2xl overflow-hidden bg-card">
                             <div class="flex flex-col p-6">