diff --git a/libs/ui/src/lib/holdings-table/holdings-table.component.html b/libs/ui/src/lib/holdings-table/holdings-table.component.html
index 728f79761..74061c143 100644
--- a/libs/ui/src/lib/holdings-table/holdings-table.component.html
+++ b/libs/ui/src/lib/holdings-table/holdings-table.component.html
@@ -252,7 +252,7 @@
     <tr
       *matFooterRowDef="displayedColumns"
       mat-footer-row
-      [ngClass]="{ 'd-none': isLoading }"
+      [ngClass]="{ 'd-none': isLoading || !performance }"
     ></tr>
   </table>
 </div>
diff --git a/libs/ui/src/lib/holdings-table/holdings-table.component.ts b/libs/ui/src/lib/holdings-table/holdings-table.component.ts
index 91d4e5e7d..58023a2c6 100644
--- a/libs/ui/src/lib/holdings-table/holdings-table.component.ts
+++ b/libs/ui/src/lib/holdings-table/holdings-table.component.ts
@@ -96,10 +96,12 @@ export class GfHoldingsTableComponent implements OnChanges, OnDestroy {
     this.dataSource = new MatTableDataSource(this.holdings);
     this.dataSource.paginator = this.paginator;
     this.dataSource.sort = this.sort;
-    this.totalValue = this.performance.currentValueInBaseCurrency;
-    this.totalChange = this.performance.netPerformanceWithCurrencyEffect;
-    this.totalChangePercentage =
-      this.performance.netPerformancePercentageWithCurrencyEffect;
+    if (this.performance) {
+      this.totalValue = this.performance?.currentValueInBaseCurrency;
+      this.totalChange = this.performance?.netPerformanceWithCurrencyEffect;
+      this.totalChangePercentage =
+        this.performance?.netPerformancePercentageWithCurrencyEffect;
+    }
 
     if (this.holdings) {
       this.isLoading = false;