diff --git a/apps/api/src/app/user/update-user-setting.dto.ts b/apps/api/src/app/user/update-user-setting.dto.ts
index c0f036a22..668c1bc66 100644
--- a/apps/api/src/app/user/update-user-setting.dto.ts
+++ b/apps/api/src/app/user/update-user-setting.dto.ts
@@ -3,10 +3,11 @@ import type {
   DateRange,
   ViewMode
 } from '@ghostfolio/common/types';
+import { Type } from 'class-transformer';
 import {
   IsBoolean,
-  IsDate,
   IsIn,
+  IsISO8601,
   IsNumber,
   IsOptional,
   IsString
@@ -53,9 +54,9 @@ export class UpdateUserSettingDto {
   @IsOptional()
   projectedTotalAmount?: number;
 
-  @IsDate()
+  @IsISO8601()
   @IsOptional()
-  retirementDate?: Date;
+  retirementDate?: string;
 
   @IsNumber()
   @IsOptional()
diff --git a/apps/client/src/app/pages/portfolio/fire/fire-page.component.ts b/apps/client/src/app/pages/portfolio/fire/fire-page.component.ts
index 03f2e7405..2562db8a7 100644
--- a/apps/client/src/app/pages/portfolio/fire/fire-page.component.ts
+++ b/apps/client/src/app/pages/portfolio/fire/fire-page.component.ts
@@ -112,7 +112,7 @@ export class FirePageComponent implements OnDestroy, OnInit {
   public onRetirementDateChange(retirementDate: Date) {
     this.dataService
       .putUserSetting({
-        retirementDate,
+        retirementDate: retirementDate.toISOString(),
         projectedTotalAmount: null
       })
       .pipe(takeUntil(this.unsubscribeSubject))
diff --git a/libs/common/src/lib/interfaces/user-settings.interface.ts b/libs/common/src/lib/interfaces/user-settings.interface.ts
index 876f3103f..217d7ba4b 100644
--- a/libs/common/src/lib/interfaces/user-settings.interface.ts
+++ b/libs/common/src/lib/interfaces/user-settings.interface.ts
@@ -11,7 +11,7 @@ export interface UserSettings {
   language?: string;
   locale?: string;
   projectedTotalAmount?: number;
-  retirementDate?: Date;
+  retirementDate?: string;
   savingsRate?: number;
   viewMode?: ViewMode;
 }