diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7805ad11d..b0abeea63 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+- Improved the usability of the create asset profile dialog in the market data section of the admin control panel
 - Improved the language localization for Chinese (`zh`)
 - Improved the language localization for German (`de`)
 - Upgraded `angular` from version `21.0.6` to `21.1.1`
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 bc3b0d374..8f956b782 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
@@ -63,7 +63,7 @@ import {
 import { DeviceDetectorService } from 'ngx-device-detector';
 import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
 import { Subject } from 'rxjs';
-import { distinctUntilChanged, switchMap, takeUntil } from 'rxjs/operators';
+import { distinctUntilChanged, takeUntil } from 'rxjs/operators';
 
 import { AdminMarketDataService } from './admin-market-data.service';
 import { GfAssetProfileDialogComponent } from './asset-profile-dialog/asset-profile-dialog.component';
@@ -482,32 +482,27 @@ export class GfAdminMarketDataComponent
         dialogRef
           .afterClosed()
           .pipe(takeUntil(this.unsubscribeSubject))
-          .subscribe(({ dataSource, symbol } = {}) => {
-            if (dataSource && symbol) {
+          .subscribe((result) => {
+            if (!result) {
+              this.router.navigate(['.'], { relativeTo: this.route });
+
+              return;
+            }
+
+            const { addAssetProfile, dataSource, symbol } = result;
+
+            if (addAssetProfile && dataSource && symbol) {
               this.adminService
                 .addAssetProfile({ dataSource, symbol })
-                .pipe(
-                  switchMap(() => {
-                    this.isLoading = true;
-                    this.changeDetectorRef.markForCheck();
-
-                    return this.adminService.fetchAdminMarketData({
-                      filters: this.activeFilters,
-                      take: this.pageSize
-                    });
-                  }),
-                  takeUntil(this.unsubscribeSubject)
-                )
-                .subscribe(({ marketData }) => {
-                  this.dataSource = new MatTableDataSource(marketData);
-                  this.dataSource.sort = this.sort;
-                  this.isLoading = false;
-
-                  this.changeDetectorRef.markForCheck();
+                .pipe(takeUntil(this.unsubscribeSubject))
+                .subscribe(() => {
+                  this.loadData();
                 });
+            } else {
+              this.loadData();
             }
 
-            this.router.navigate(['.'], { relativeTo: this.route });
+            this.onOpenAssetProfileDialog({ dataSource, symbol });
           });
       });
   }
diff --git a/apps/client/src/app/components/admin-market-data/create-asset-profile-dialog/create-asset-profile-dialog.component.ts b/apps/client/src/app/components/admin-market-data/create-asset-profile-dialog/create-asset-profile-dialog.component.ts
index 6c180b034..fbf8afa03 100644
--- a/apps/client/src/app/components/admin-market-data/create-asset-profile-dialog/create-asset-profile-dialog.component.ts
+++ b/apps/client/src/app/components/admin-market-data/create-asset-profile-dialog/create-asset-profile-dialog.component.ts
@@ -101,6 +101,7 @@ export class GfCreateAssetProfileDialogComponent implements OnDestroy, OnInit {
   public onSubmit() {
     if (this.mode === 'auto') {
       this.dialogRef.close({
+        addAssetProfile: true,
         dataSource:
           this.createAssetProfileForm.get('searchSymbol').value.dataSource,
         symbol: this.createAssetProfileForm.get('searchSymbol').value.symbol
@@ -127,10 +128,15 @@ export class GfCreateAssetProfileDialogComponent implements OnDestroy, OnInit {
           takeUntil(this.unsubscribeSubject)
         )
         .subscribe(() => {
-          this.dialogRef.close();
+          this.dialogRef.close({
+            addAssetProfile: false,
+            dataSource: this.dataSourceForExchangeRates,
+            symbol: `${DEFAULT_CURRENCY}${currency}`
+          });
         });
     } else if (this.mode === 'manual') {
       this.dialogRef.close({
+        addAssetProfile: true,
         dataSource: 'MANUAL',
         symbol: `${this.ghostfolioPrefix}${this.createAssetProfileForm.get('addSymbol').value}`
       });
diff --git a/libs/common/src/lib/helper.ts b/libs/common/src/lib/helper.ts
index 9ee7d6220..4db1fcf2d 100644
--- a/libs/common/src/lib/helper.ts
+++ b/libs/common/src/lib/helper.ts
@@ -223,8 +223,8 @@ export function getDateFormatString(aLocale?: string) {
   );
 
   return formatObject
-    .map((object) => {
-      switch (object.type) {
+    .map(({ type, value }) => {
+      switch (type) {
         case 'day':
           return 'dd';
         case 'month':
@@ -232,7 +232,7 @@ export function getDateFormatString(aLocale?: string) {
         case 'year':
           return 'yyyy';
         default:
-          return object.value;
+          return value;
       }
     })
     .join('');
@@ -271,8 +271,8 @@ export function getLowercase(object: object, path: string) {
 export function getNumberFormatDecimal(aLocale?: string) {
   const formatObject = new Intl.NumberFormat(aLocale).formatToParts(9999.99);
 
-  return formatObject.find((object) => {
-    return object.type === 'decimal';
+  return formatObject.find(({ type }) => {
+    return type === 'decimal';
   })?.value;
 }
 
@@ -281,8 +281,8 @@ export function getNumberFormatGroup(aLocale = getLocale()) {
     useGrouping: true
   }).formatToParts(9999.99);
 
-  return formatObject.find((object) => {
-    return object.type === 'group';
+  return formatObject.find(({ type }) => {
+    return type === 'group';
   })?.value;
 }
 
diff --git a/libs/ui/src/lib/symbol-autocomplete/symbol-autocomplete.component.ts b/libs/ui/src/lib/symbol-autocomplete/symbol-autocomplete.component.ts
index 11d6f09dc..c74e8a077 100644
--- a/libs/ui/src/lib/symbol-autocomplete/symbol-autocomplete.component.ts
+++ b/libs/ui/src/lib/symbol-autocomplete/symbol-autocomplete.component.ts
@@ -121,7 +121,7 @@ export class GfSymbolAutocompleteComponent
     this.control.valueChanges
       .pipe(
         filter((query) => {
-          if (query.length === 0) {
+          if (query?.length === 0) {
             this.showDefaultOptions();
 
             return false;