diff --git a/packages/atomic/src/components/common/facets/facet-date-input/facet-date-input.tsx b/packages/atomic/src/components/common/facets/facet-date-input/facet-date-input.tsx
index 51411d06444..af716a8939b 100644
--- a/packages/atomic/src/components/common/facets/facet-date-input/facet-date-input.tsx
+++ b/packages/atomic/src/components/common/facets/facet-date-input/facet-date-input.tsx
@@ -40,6 +40,14 @@ export class FacetDateInput {
     this.start = range ? parseDate(range.start).toDate() : undefined;
     this.end = range ? parseDate(range.end).toDate() : undefined;
   }
+  public componentDidUpdate() {
+    if (!this.startRef.value && !this.endRef.value) {
+      this.startRef.min = this.min || this.formattedDateValue('1401-01-01');
+      this.endRef.max = this.max || '';
+      this.startRef.max = this.max || '';
+      this.endRef.min = this.min || '';
+    }
+  }
 
   private apply() {
     if (!this.startRef.validity.valid || !this.endRef.validity.valid) {
@@ -138,7 +146,7 @@ export class FacetDateInput {
           placeholder={placeholder}
           pattern={pattern}
           required
-          min={this.min || this.formattedDateValue(this.start)}
+          min={this.formattedDateValue(this.start) || this.min}
           max={this.max}
           value={this.formattedDateValue(range?.end)}
           onInput={(e) =>