diff --git a/apps/client/src/app/components/admin-market-data/admin-market-data.component.ts b/apps/client/src/app/components/admin-market-data/admin-market-data.component.ts
index 4ceb70a6b..4b810555a 100644
--- a/apps/client/src/app/components/admin-market-data/admin-market-data.component.ts
+++ b/apps/client/src/app/components/admin-market-data/admin-market-data.component.ts
@@ -206,23 +206,18 @@ export class GfAdminMarketDataComponent
     this.displayedColumns.push('comment');
     this.displayedColumns.push('actions');
 
-    if (this.route.snapshot.routeConfig.path === 'market-data/create') {
-      this.openCreateAssetProfileDialog();
-    } else {
-      this.route.paramMap
-        .pipe(takeUntil(this.unsubscribeSubject))
-        .subscribe((paramMap) => {
-          const dataSource = paramMap.get('dataSource') as DataSource;
-          const symbol = paramMap.get('symbol');
-
-          if (dataSource && symbol) {
-            this.openAssetProfileDialog({
-              dataSource,
-              symbol
-            });
-          }
-        });
-    }
+    this.route.paramMap
+      .pipe(takeUntil(this.unsubscribeSubject))
+      .subscribe((paramMap) => {
+        const dataSource = paramMap.get('dataSource') as DataSource;
+        const symbol = paramMap.get('symbol');
+
+        if (dataSource && symbol) {
+          this.openAssetProfileDialog({ dataSource, symbol });
+        } else if (this.route.snapshot.routeConfig.path.endsWith('/create')) {
+          this.openCreateAssetProfileDialog();
+        }
+      });
 
     this.userService.stateChanged
       .pipe(takeUntil(this.unsubscribeSubject))
@@ -234,14 +229,14 @@ export class GfAdminMarketDataComponent
             this.user.settings.locale
           );
         }
-      });
 
-    this.filters$
-      .pipe(distinctUntilChanged(), takeUntil(this.unsubscribeSubject))
-      .subscribe((filters) => {
-        this.activeFilters = filters;
+        this.filters$
+          .pipe(distinctUntilChanged(), takeUntil(this.unsubscribeSubject))
+          .subscribe((filters) => {
+            this.activeFilters = filters;
 
-        this.loadData();
+            this.loadData();
+          });
       });
 
     addIcons({
@@ -278,6 +273,13 @@ export class GfAdminMarketDataComponent
     this.selection = new SelectionModel(true);
   }
 
+  public getRouterLinkToAdminControlMarketData({
+    dataSource,
+    symbol
+  }: AssetProfileIdentifier) {
+    return [...this.routerLinkAdminControlMarketData, dataSource, symbol];
+  }
+
   public onChangePage(page: PageEvent) {
     this.loadData({
       pageIndex: page.pageIndex,
@@ -353,10 +355,6 @@ export class GfAdminMarketDataComponent
     });
   }
 
-  public getRouterLinkToAdminControlMarketData(dataSource, symbol) {
-    return [...this.routerLinkAdminControlMarketData, dataSource, symbol];
-  }
-
   public ngOnDestroy() {
     this.unsubscribeSubject.next();
     this.unsubscribeSubject.complete();
diff --git a/apps/client/src/app/components/admin-market-data/admin-market-data.html b/apps/client/src/app/components/admin-market-data/admin-market-data.html
index d64b541a8..24c82608c 100644
--- a/apps/client/src/app/components/admin-market-data/admin-market-data.html
+++ b/apps/client/src/app/components/admin-market-data/admin-market-data.html
@@ -256,10 +256,10 @@
                 <a
                   mat-menu-item
                   [routerLink]="
-                    getRouterLinkToAdminControlMarketData(
-                      element.dataSource,
-                      element.symbol
-                    )
+                    getRouterLinkToAdminControlMarketData({
+                      dataSource: element.dataSource,
+                      symbol: element.symbol
+                    })
                   "
                 >
                   <span class="align-items-center d-flex">
diff --git a/apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.component.ts b/apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.component.ts
index f1987c021..65689b609 100644
--- a/apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.component.ts
+++ b/apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.component.ts
@@ -8,6 +8,7 @@ import { CreateOrderDto } from '@ghostfolio/common/dtos';
 import { DATE_FORMAT, downloadAsFile } from '@ghostfolio/common/helper';
 import {
   Activity,
+  AssetProfileIdentifier,
   DataProviderInfo,
   EnhancedSymbolProfile,
   Filter,
@@ -546,6 +547,13 @@ export class GfHoldingDetailDialogComponent implements OnDestroy, OnInit {
       });
   }
 
+  public getRouterLinkToAdminControlMarketData({
+    dataSource,
+    symbol
+  }: AssetProfileIdentifier) {
+    return [...this.routerLinkAdminControlMarketData, dataSource, symbol];
+  }
+
   public onCloneActivity(aActivity: Activity) {
     this.router.navigate(
       internalRoutes.portfolio.subRoutes.activities.routerLink,
@@ -618,14 +626,6 @@ export class GfHoldingDetailDialogComponent implements OnDestroy, OnInit {
     }
   }
 
-  public getRouterLinkToAdminControlMarketDataForDataSourceAndSymbol() {
-    return [
-      ...this.routerLinkAdminControlMarketData,
-      this.SymbolProfile?.dataSource,
-      this.SymbolProfile?.symbol
-    ];
-  }
-
   public onUpdateActivity(aActivity: Activity) {
     this.router.navigate(
       internalRoutes.portfolio.subRoutes.activities.routerLink,