diff --git a/libs/ui/src/lib/top-holdings/top-holdings.component.html b/libs/ui/src/lib/top-holdings/top-holdings.component.html
index d244fa449c..11900106ae 100644
--- a/libs/ui/src/lib/top-holdings/top-holdings.component.html
+++ b/libs/ui/src/lib/top-holdings/top-holdings.component.html
@@ -121,13 +121,7 @@
                 *matRowDef="let row; columns: displayedColumns"
                 mat-row
                 [class.cursor-pointer]="canShowDetails(row)"
-                (click)="
-                  canShowDetails(row) &&
-                    onClickHolding({
-                      dataSource: row.position.assetProfile.dataSource,
-                      symbol: row.position.assetProfile.symbol
-                    })
-                "
+                (click)="onClickHolding(row)"
               ></tr>
               <tr
                 *matFooterRowDef="displayedColumns"
diff --git a/libs/ui/src/lib/top-holdings/top-holdings.component.ts b/libs/ui/src/lib/top-holdings/top-holdings.component.ts
index 28d52207cd..83bcda3cdc 100644
--- a/libs/ui/src/lib/top-holdings/top-holdings.component.ts
+++ b/libs/ui/src/lib/top-holdings/top-holdings.component.ts
@@ -87,8 +87,15 @@ export class GfTopHoldingsComponent implements OnChanges {
     return !!holding?.position && canOpenHoldingDetail(holding.position);
   }
 
-  public onClickHolding({ dataSource, symbol }: AssetProfileIdentifier) {
-    this.holdingClicked.emit({ dataSource, symbol });
+  public onClickHolding({ position }: { position?: PortfolioPosition }) {
+    if (!position || !canOpenHoldingDetail(position)) {
+      return;
+    }
+
+    this.holdingClicked.emit({
+      dataSource: position.assetProfile.dataSource,
+      symbol: position.assetProfile.symbol
+    });
   }
 
   public onShowAllHoldings() {