diff --git a/src/app/clients/client-stepper/client-general-step/client-general-step.component.html b/src/app/clients/client-stepper/client-general-step/client-general-step.component.html
index ba69c7b133..8f9cbdbcae 100644
--- a/src/app/clients/client-stepper/client-general-step/client-general-step.component.html
+++ b/src/app/clients/client-stepper/client-general-step/client-general-step.component.html
@@ -171,8 +171,7 @@
           <mat-label>{{ 'labels.inputs.Incorporation Validity Till Date' | translate }}</mat-label>
           <input
             matInput
-            [min]="minDate"
-            [max]="maxDate"
+            [min]="createClientForm.get('dateOfBirth')?.value || minDate"
             [matDatepicker]="incorpValidityTillDateDatePicker"
             formControlName="incorpValidityTillDate"
           />
diff --git a/src/app/clients/edit-client/edit-client.component.html b/src/app/clients/edit-client/edit-client.component.html
index 76dd3095a0..9737fd1d8c 100644
--- a/src/app/clients/edit-client/edit-client.component.html
+++ b/src/app/clients/edit-client/edit-client.component.html
@@ -234,8 +234,7 @@
                 [placeholder]="'labels.inputs.Incorporation Validity Till Date' | translate"
                 [title]="'labels.inputs.Incorporation Validity Till Date' | translate"
                 matInput
-                [min]="minDate"
-                [max]="maxDate"
+                [min]="editClientForm.get('dateOfBirth')?.value || minDate"
                 [matDatepicker]="incorpValidityTillDateDatePicker"
                 formControlName="incorpValidityTillDate"
               />