diff --git a/apps/client/src/app/components/benchmark-comparator/benchmark-comparator.component.ts b/apps/client/src/app/components/benchmark-comparator/benchmark-comparator.component.ts
index 72241f0454..6a00e1a35e 100644
--- a/apps/client/src/app/components/benchmark-comparator/benchmark-comparator.component.ts
+++ b/apps/client/src/app/components/benchmark-comparator/benchmark-comparator.component.ts
@@ -72,7 +72,13 @@ export class GfBenchmarkComparatorComponent implements OnChanges, OnDestroy {
   public readonly benchmarks = input<Partial<SymbolProfile>[]>();
   public readonly colorScheme = input<ColorScheme>();
   public readonly isLoading = input<boolean>();
-  public readonly locale = input(getLocale());
+
+  public readonly locale = input(getLocale(), {
+    transform: (value?: string) => {
+      return value ?? getLocale();
+    }
+  });
+
   public readonly performanceDataItems = input.required<LineChartItem[]>();
   public readonly user = input<User>();
 
diff --git a/libs/ui/src/lib/accounts-table/accounts-table.component.ts b/libs/ui/src/lib/accounts-table/accounts-table.component.ts
index e986932906..30e56e7833 100644
--- a/libs/ui/src/lib/accounts-table/accounts-table.component.ts
+++ b/libs/ui/src/lib/accounts-table/accounts-table.component.ts
@@ -62,7 +62,13 @@ export class GfAccountsTableComponent {
   public readonly hasPermissionToDeleteAccount = input<boolean>();
   public readonly hasPermissionToOpenDetails = input(true);
   public readonly hasPermissionToUpdateAccount = input<boolean>();
-  public readonly locale = input(getLocale());
+
+  public readonly locale = input(getLocale(), {
+    transform: (value?: string) => {
+      return value ?? getLocale();
+    }
+  });
+
   public readonly showActions = input<boolean>();
   public readonly showActivitiesCount = input(true);
   public readonly showAllocationInPercentage = input<boolean>();
diff --git a/libs/ui/src/lib/benchmark/benchmark-detail-dialog/benchmark-detail-dialog.html b/libs/ui/src/lib/benchmark/benchmark-detail-dialog/benchmark-detail-dialog.html
index 2ab60b9d2d..3ff7f03ab6 100644
--- a/libs/ui/src/lib/benchmark/benchmark-detail-dialog/benchmark-detail-dialog.html
+++ b/libs/ui/src/lib/benchmark/benchmark-detail-dialog/benchmark-detail-dialog.html
@@ -1,7 +1,7 @@
 <gf-dialog-header
   position="center"
   [deviceType]="data.deviceType"
-  [title]="assetProfile?.name ?? assetProfile?.symbol ?? ''"
+  [title]="assetProfile?.name ?? assetProfile?.symbol"
   (closeButtonClicked)="onClose()"
 />
 
diff --git a/libs/ui/src/lib/dialog-header/dialog-header.component.html b/libs/ui/src/lib/dialog-header/dialog-header.component.html
index ed9fc41f4a..435af1b295 100644
--- a/libs/ui/src/lib/dialog-header/dialog-header.component.html
+++ b/libs/ui/src/lib/dialog-header/dialog-header.component.html
@@ -1,10 +1,10 @@
 <div class="d-flex" mat-dialog-title>
   <span
     class="flex-grow-1 text-truncate"
-    [class.text-center]="position === 'center'"
-    >{{ title }}</span
+    [class.text-center]="position() === 'center'"
+    >{{ title() }}</span
   >
-  @if (deviceType !== 'mobile') {
+  @if (deviceType() !== 'mobile') {
     <button class="no-min-width px-0" mat-button (click)="onClickCloseButton()">
       <ion-icon name="close" size="large" />
     </button>
diff --git a/libs/ui/src/lib/dialog-header/dialog-header.component.ts b/libs/ui/src/lib/dialog-header/dialog-header.component.ts
index 4868b22b89..f16d66c4b5 100644
--- a/libs/ui/src/lib/dialog-header/dialog-header.component.ts
+++ b/libs/ui/src/lib/dialog-header/dialog-header.component.ts
@@ -1,9 +1,8 @@
 import {
   ChangeDetectionStrategy,
   Component,
-  EventEmitter,
-  Input,
-  Output
+  input,
+  output
 } from '@angular/core';
 import { MatButtonModule } from '@angular/material/button';
 import { MatDialogModule } from '@angular/material/dialog';
@@ -20,17 +19,17 @@ import { close } from 'ionicons/icons';
   templateUrl: './dialog-header.component.html'
 })
 export class GfDialogHeaderComponent {
-  @Input() deviceType: string;
-  @Input() position: 'center' | 'left' = 'left';
-  @Input() title: string;
+  public readonly deviceType = input<string>();
+  public readonly position = input<'center' | 'left'>('left');
+  public readonly title = input.required<string | null | undefined>();
 
-  @Output() closeButtonClicked = new EventEmitter<void>();
+  public readonly closeButtonClicked = output<void>();
 
   public constructor() {
     addIcons({ close });
   }
 
-  public onClickCloseButton() {
+  protected onClickCloseButton() {
     this.closeButtonClicked.emit();
   }
 }
diff --git a/libs/ui/src/lib/holdings-table/holdings-table.component.ts b/libs/ui/src/lib/holdings-table/holdings-table.component.ts
index 1894260b78..0be6e54f6e 100644
--- a/libs/ui/src/lib/holdings-table/holdings-table.component.ts
+++ b/libs/ui/src/lib/holdings-table/holdings-table.component.ts
@@ -54,7 +54,13 @@ export class GfHoldingsTableComponent {
   public readonly hasPermissionToShowQuantities = input(true);
   public readonly hasPermissionToShowValues = input(true);
   public readonly holdings = input.required<PortfolioPosition[] | undefined>();
-  public readonly locale = input(getLocale());
+
+  public readonly locale = input(getLocale(), {
+    transform: (value?: string) => {
+      return value ?? getLocale();
+    }
+  });
+
   public readonly mode = input<'default' | 'simple'>('default');
   public readonly pageSize = model(Number.MAX_SAFE_INTEGER);