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 d32ad9989..2cf540bfa 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
@@ -66,8 +66,8 @@ export class AssetProfileDialog implements OnDestroy, OnInit {
     }),
     name: ['', Validators.required],
     scraperConfiguration: this.formBuilder.group({
-      defaultMarketPrice: 0,
-      headers: '',
+      defaultMarketPrice: undefined,
+      headers: JSON.stringify({}),
       locale: '',
       mode: '',
       selector: '',
@@ -88,13 +88,14 @@ export class AssetProfileDialog implements OnDestroy, OnInit {
   public isBenchmark = false;
   public marketDataItems: MarketData[] = [];
   public modeValues = [
-    { value: 'lazy', viewValue: 'Lazy' },
-    { value: 'instant', viewValue: 'Instant' }
+    { value: 'lazy', viewValue: $localize`Lazy` },
+    { value: 'instant', viewValue: $localize`Instant` }
   ];
+  public selectedModeValue: string;
+  public scraperConfiguationIsExpanded = signal(false);
   public sectors: {
     [name: string]: { name: string; value: number };
   };
-  readonly panelOpenState = signal(false);
   public user: User;
 
   private static readonly HISTORICAL_DATA_TEMPLATE = `date;marketPrice\n${format(
@@ -126,6 +127,7 @@ export class AssetProfileDialog implements OnDestroy, OnInit {
 
   public initialize() {
     this.historicalDataItems = undefined;
+    this.selectedModeValue = 'lazy';
 
     this.userService.stateChanged
       .pipe(takeUntil(this.unsubscribeSubject))
@@ -196,12 +198,14 @@ export class AssetProfileDialog implements OnDestroy, OnInit {
           name: this.assetProfile.name ?? this.assetProfile.symbol,
           scraperConfiguration: {
             defaultMarketPrice:
-              this.assetProfile?.scraperConfiguration?.defaultMarketPrice ?? 0,
+              this.assetProfile?.scraperConfiguration?.defaultMarketPrice,
             headers: JSON.stringify(
               this.assetProfile?.scraperConfiguration?.headers ?? {}
             ),
             locale: this.assetProfile?.scraperConfiguration?.locale ?? '',
-            mode: this.assetProfile?.scraperConfiguration?.mode ?? '',
+            mode:
+              this.assetProfile?.scraperConfiguration?.mode ??
+              this.selectedModeValue,
             selector: this.assetProfile?.scraperConfiguration?.selector ?? '',
             url: this.assetProfile?.scraperConfiguration?.url ?? ''
           },
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 d64168225..520a29e8f 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
@@ -281,11 +281,11 @@
       <div class="mb-3">
         <mat-accordion class="my-3">
           <mat-expansion-panel
-            (closed)="panelOpenState.set(false)"
-            (opened)="panelOpenState.set(true)"
+            (closed)="scraperConfiguationIsExpanded.set(false)"
+            (opened)="scraperConfiguationIsExpanded.set(true)"
           >
             <mat-expansion-panel-header>
-              <mat-panel-title> Scraper Configuration </mat-panel-title>
+              <mat-panel-title i18n> Scraper Configuration </mat-panel-title>
             </mat-expansion-panel-header>
             <div formGroupName="scraperConfiguration">
               <div class="mt-3">
@@ -296,39 +296,36 @@
                     matInput
                     type="number"
                   />
-                  <div class="align-items-end d-flex"></div>
                 </mat-form-field>
               </div>
               <div class="mt-3">
                 <mat-form-field appearance="outline" class="w-100 without-hint">
                   <mat-label i18n>Headers</mat-label>
-                  <div class="align-items-end d-flex">
-                    <textarea
-                      cdkTextareaAutosize
-                      formControlName="headers"
-                      matInput
-                      type="text"
-                      [matAutocomplete]="auto"
-                    ></textarea>
-                  </div>
+                  <textarea
+                    cdkTextareaAutosize
+                    formControlName="headers"
+                    matInput
+                    type="text"
+                    [matAutocomplete]="auto"
+                  ></textarea>
                 </mat-form-field>
               </div>
               <div class="mt-3">
                 <mat-form-field appearance="outline" class="w-100 without-hint">
                   <mat-label i18n>Locale</mat-label>
-                  <div class="align-items-end d-flex">
-                    <input formControlName="locale" matInput type="text" />
-                  </div>
+                  <input formControlName="locale" matInput type="text" />
                 </mat-form-field>
               </div>
               <div class="mt-3">
                 <mat-form-field appearance="outline" class="w-100 without-hint">
                   <mat-label i18n>Mode</mat-label>
-                  <mat-select formControlName="mode">
-                    <mat-option [value]="null" />
-                    @for (modeVal of modeValues; track modeVal) {
-                      <mat-option [value]="modeVal.value">{{
-                        modeVal.viewValue
+                  <mat-select
+                    formControlName="mode"
+                    [(ngModel)]="selectedModeValue"
+                  >
+                    @for (modeValue of modeValues; track modeValue) {
+                      <mat-option [value]="modeValue.value">{{
+                        modeValue.viewValue
                       }}</mat-option>
                     }
                   </mat-select>
@@ -337,32 +334,38 @@
               <div class="mt-3">
                 <mat-form-field appearance="outline" class="w-100 without-hint">
                   <mat-label i18n>Selector</mat-label>
-                  <div class="align-items-end d-flex">
-                    <textarea
-                      cdkTextareaAutosize
-                      formControlName="selector"
-                      matInput
-                      type="text"
-                      (keyup.enter)="$event.stopPropagation()"
-                    ></textarea>
-                  </div>
+                  <textarea
+                    cdkTextareaAutosize
+                    formControlName="selector"
+                    matInput
+                    type="text"
+                  ></textarea>
                 </mat-form-field>
               </div>
               <div class="mt-3">
                 <mat-form-field appearance="outline" class="w-100 without-hint">
                   <mat-label i18n>URL</mat-label>
-                  <div class="align-items-end d-flex">
-                    <input formControlName="url" matInput type="text" />
-                  </div>
+                  <input formControlName="url" matInput type="text" />
                 </mat-form-field>
               </div>
-              <div class="m-3">
+              <div class="my-3">
                 <button
                   color="accent"
                   mat-flat-button
                   type="button"
                   [disabled]="
-                    assetProfileForm.get('scraperConfiguration').value === '{}'
+                    assetProfileForm.controls.scraperConfiguration.controls
+                      .defaultMarketPrice.value === null &&
+                    assetProfileForm.controls.scraperConfiguration.controls
+                      .headers.value === '{}' &&
+                    assetProfileForm.controls.scraperConfiguration.controls
+                      .locale.value === '' &&
+                    !assetProfileForm.controls.scraperConfiguration.controls
+                      .mode.dirty &&
+                    assetProfileForm.controls.scraperConfiguration.controls
+                      .selector.value === '' &&
+                    assetProfileForm.controls.scraperConfiguration.controls.url
+                      .value === ''
                   "
                   (click)="onTestMarketData()"
                 >