diff --git a/apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.component.ts b/apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.component.ts
index 4366ba8d9..03dc717d5 100644
--- a/apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.component.ts
+++ b/apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.component.ts
@@ -189,20 +189,20 @@ export class AssetProfileDialog implements OnDestroy, OnInit {
           symbol: this.data.symbol
         })
         .pipe(
-          takeUntil(this.unsubscribeSubject),
           catchError(({ error, message }) => {
             this.snackBar.open(`${error}: ${message[0]}`, undefined, {
               duration: 3000
             });
             return EMPTY;
-          })
+          }),
+          takeUntil(this.unsubscribeSubject)
         )
         .subscribe(() => {
           this.initialize();
         });
     } catch {
       this.snackBar.open(
-        $localize`Oops! Could not parse historical data`,
+        $localize`Oops! Could not parse historical data.`,
         undefined,
         { duration: 3000 }
       );
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 cb866f5e9..72d673776 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
@@ -73,7 +73,7 @@
         color="accent"
         mat-flat-button
         type="button"
-        [disabled]="assetProfileForm.controls['historicalData']?.controls['csvString']?.value === ''"
+        [disabled]="!assetProfileForm.controls['historicalData']?.controls['csvString'].touched || assetProfileForm.controls['historicalData']?.controls['csvString']?.value === ''"
         (click)="onImportHistoricalData()"
       >
         <ng-container i18n>Import</ng-container>
@@ -178,13 +178,13 @@
       </ng-container>
     </div>
     <div *ngIf="assetProfile?.dataSource === 'MANUAL'" class="mt-3">
-      <mat-form-field appearance="outline" class="w-100">
+      <mat-form-field appearance="outline" class="w-100 without-hint">
         <mat-label i18n>Name</mat-label>
         <input formControlName="name" matInput type="text" />
       </mat-form-field>
     </div>
     <div *ngIf="assetProfile?.dataSource === 'MANUAL'" class="mt-3">
-      <mat-form-field appearance="outline" class="w-100">
+      <mat-form-field appearance="outline" class="w-100 without-hint">
         <mat-label i18n>Asset Class</mat-label>
         <mat-select formControlName="assetClass">
           <mat-option [value]="null"></mat-option>
@@ -197,7 +197,7 @@
       </mat-form-field>
     </div>
     <div *ngIf="assetProfile?.dataSource === 'MANUAL'" class="mt-3">
-      <mat-form-field appearance="outline" class="w-100">
+      <mat-form-field appearance="outline" class="w-100 without-hint">
         <mat-label i18n>Asset Sub Class</mat-label>
         <mat-select formControlName="assetSubClass">
           <mat-option [value]="null"></mat-option>