diff --git a/libs/ui/src/lib/fire-calculator/fire-calculator.component.html b/libs/ui/src/lib/fire-calculator/fire-calculator.component.html
index a2d5359b5..ef4722255 100644
--- a/libs/ui/src/lib/fire-calculator/fire-calculator.component.html
+++ b/libs/ui/src/lib/fire-calculator/fire-calculator.component.html
@@ -40,6 +40,7 @@
             formControlName="retirementDate"
             matInput
             [matDatepicker]="datepicker"
+            [min]="minDate"
           />
           <mat-datepicker-toggle
             matIconSuffix
@@ -50,7 +51,6 @@
             #datepicker
             startView="multi-year"
             [disabled]="hasPermissionToUpdateUserSettings !== true"
-            [min]="minDate"
             (monthSelected)="setMonthAndYear($event, datepicker)"
           >
           </mat-datepicker>
diff --git a/libs/ui/src/lib/fire-calculator/fire-calculator.component.ts b/libs/ui/src/lib/fire-calculator/fire-calculator.component.ts
index f890217bf..feee04881 100644
--- a/libs/ui/src/lib/fire-calculator/fire-calculator.component.ts
+++ b/libs/ui/src/lib/fire-calculator/fire-calculator.component.ts
@@ -104,7 +104,10 @@ export class GfFireCalculatorComponent implements OnChanges, OnDestroy {
   public chart: Chart<'bar'>;
   public isLoading = true;
   public periodsToRetire = 0;
-  public minDate = addDays(new Date(), 1); // Tomorrow's date
+
+  public get minDate(): Date {
+    return addDays(new Date(), 1); // Tomorrow's date
+  }
 
   private readonly CONTRIBUTION_PERIOD = 12;
   private readonly DEFAULT_RETIREMENT_DATE = startOfMonth(