diff --git a/apps/api/src/app/admin/admin.service.ts b/apps/api/src/app/admin/admin.service.ts
index e8a2432e8..e88db6f9e 100644
--- a/apps/api/src/app/admin/admin.service.ts
+++ b/apps/api/src/app/admin/admin.service.ts
@@ -25,6 +25,7 @@ import { MarketDataPreset } from '@ghostfolio/common/types';
 
 import { BadRequestException, Injectable } from '@nestjs/common';
 import {
+  $Enums,
   AssetSubClass,
   DataSource,
   Prisma,
@@ -334,10 +335,14 @@ export class AdminService {
     symbol,
     symbolMapping
   }: Prisma.SymbolProfileUpdateInput & UniqueAsset) {
+    const symbolProfileOverride = {
+      name: name as string,
+      assetClass: assetClass as $Enums.AssetClass,
+      assetSubClass: assetSubClass as $Enums.AssetSubClass
+    };
+
     const updatedSymbolProfile: Prisma.SymbolProfileUpdateInput & UniqueAsset =
       {
-        assetClass,
-        assetSubClass,
         comment,
         countries,
         currency,
@@ -347,16 +352,12 @@ export class AdminService {
         symbol,
         symbolMapping,
         ...(dataSource === 'MANUAL'
-          ? { name }
+          ? { name, assetClass, assetSubClass }
           : {
               SymbolProfileOverrides: {
                 upsert: {
-                  create: {
-                    name: name as string
-                  },
-                  update: {
-                    name: name as string
-                  }
+                  create: symbolProfileOverride,
+                  update: symbolProfileOverride
                 }
               }
             })
diff --git a/apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.html b/apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.html
index 93240ba3a..56d742dff 100644
--- a/apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.html
+++ b/apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.html
@@ -224,7 +224,7 @@
         />
       </mat-form-field>
     </div>
-    <div *ngIf="assetProfile?.dataSource === 'MANUAL'" class="mt-3">
+    <div class="mt-3">
       <mat-form-field appearance="outline" class="w-100 without-hint">
         <mat-label i18n>Asset Class</mat-label>
         <mat-select formControlName="assetClass">
@@ -237,7 +237,7 @@
         </mat-select>
       </mat-form-field>
     </div>
-    <div *ngIf="assetProfile?.dataSource === 'MANUAL'" class="mt-3">
+    <div class="mt-3">
       <mat-form-field appearance="outline" class="w-100 without-hint">
         <mat-label i18n>Asset Sub Class</mat-label>
         <mat-select formControlName="assetSubClass">