diff --git a/IsraelHiking.Web/src/application/components/dialogs/shares-dialog.component.html b/IsraelHiking.Web/src/application/components/dialogs/shares-dialog.component.html
index df0670869..468edfe71 100644
--- a/IsraelHiking.Web/src/application/components/dialogs/shares-dialog.component.html
+++ b/IsraelHiking.Web/src/application/components/dialogs/shares-dialog.component.html
@@ -16,7 +16,7 @@
         <div class="flex flex-row">
             <button class="w-full" mat-raised-button color="primary" matDialogClose (click)="createShare()" angulartics2On="click" angularticsCategory="Share" angularticsAction="Create share from shares dialog"><i class="fa icon-plus fa-lg"></i> {{resources.createShare}}</button>
         </div>
-        <div *ngFor="let shareUrl of filteredShareUrls" class="item">
+        <div *ngFor="let shareUrl of filteredShareUrls; trackBy:trackById" class="item">
             <div [ngClass]="{'active': selectedShareUrlId === shareUrl.id}" (click)="toggleSelectedShareUrl(shareUrl)">
                 <div class="flex flex-row" *ngIf="!isShareUrlInEditMode(shareUrl.id)">
                     <div class="item-image">
diff --git a/IsraelHiking.Web/src/application/components/dialogs/shares-dialog.component.ts b/IsraelHiking.Web/src/application/components/dialogs/shares-dialog.component.ts
index d2116fa9b..6e6afe096 100644
--- a/IsraelHiking.Web/src/application/components/dialogs/shares-dialog.component.ts
+++ b/IsraelHiking.Web/src/application/components/dialogs/shares-dialog.component.ts
@@ -207,4 +207,8 @@ export class SharesDialogComponent extends BaseMapComponent implements OnInit, O
     public getShareSocialLinks() {
         return this.shareUrlsService.getShareSocialLinks(this.getSelectedShareUrl());
     }
+
+    public trackById(_: number, shareUrl: ShareUrl) {
+        return shareUrl.id;
+    }
 }
diff --git a/IsraelHiking.Web/src/application/components/dialogs/traces-dialog.component.html b/IsraelHiking.Web/src/application/components/dialogs/traces-dialog.component.html
index fe10b1621..1c0d935aa 100644
--- a/IsraelHiking.Web/src/application/components/dialogs/traces-dialog.component.html
+++ b/IsraelHiking.Web/src/application/components/dialogs/traces-dialog.component.html
@@ -19,7 +19,7 @@
                 <input type="file" (change)="uploadToOsm($event)" [style.display]="'none'" />
             </label>
         </div>
-        <div *ngFor="let trace of filteredTraces" class="item">
+        <div *ngFor="let trace of filteredTraces; trackBy:trackById" class="item">
             <div [ngClass]="{'active': selectedTraceId === trace.id}" (click)="toggleSelectedTrace(trace)">
                 <div class="flex flex-row" *ngIf="!isTraceInEditMode(trace.id)">
                     <div class="item-image">
diff --git a/IsraelHiking.Web/src/application/components/dialogs/traces-dialog.component.ts b/IsraelHiking.Web/src/application/components/dialogs/traces-dialog.component.ts
index 970e960c8..5cb4652bc 100644
--- a/IsraelHiking.Web/src/application/components/dialogs/traces-dialog.component.ts
+++ b/IsraelHiking.Web/src/application/components/dialogs/traces-dialog.component.ts
@@ -258,4 +258,8 @@ export class TracesDialogComponent extends BaseMapComponent implements OnInit, O
                 throw new Error(`invalid visibility value: ${visibility}`);
         }
     }
+
+    public trackById(_: number, trace: Trace) {
+        return trace.id;
+    }
 }