diff --git a/frontend/src/utils/form/datepicker.js b/frontend/src/utils/form/datepicker.js
index 4891415c2..dbc1ee1a1 100644
--- a/frontend/src/utils/form/datepicker.js
+++ b/frontend/src/utils/form/datepicker.js
@@ -151,7 +151,10 @@ export class Datepicker {
 
     const setDatepickerDate = () => {
       const parsedMomentDate = moment(this._element.value, FORM_DATE_FORMAT_MOMENT[this.elementType]);
-      if (parsedMomentDate.isValid()) {
+      const parsedMomentDateInternal = moment(this._element.value, FORM_DATE_FORMAT[this.elementType]);
+
+      // only set the datepicker date if the input is either in valid fancy format or in valid internal format
+      if (parsedMomentDate.isValid() || parsedMomentDateInternal.isValid()) {
         this.datepickerInstance.selectDate(parsedMomentDate.toDate());
       }
       // reregister change event to prevent event loop