diff --git a/src/apps/content-editor/src/app/components/Editor/Field/Field.tsx b/src/apps/content-editor/src/app/components/Editor/Field/Field.tsx
index 12fdd53ebe..f06aafeec9 100644
--- a/src/apps/content-editor/src/app/components/Editor/Field/Field.tsx
+++ b/src/apps/content-editor/src/app/components/Editor/Field/Field.tsx
@@ -912,7 +912,7 @@ export const Field = ({
           <FieldTypeDate
             name={name}
             required={required}
-            value={value ? new Date(value) : null}
+            value={value ? moment(value).toDate() : null}
             // format="MMM dd, yyyy"
             onChange={(date) => onDateChange(date, name, datatype)}
             error={errors && Object.values(errors)?.some((error) => !!error)}
diff --git a/src/shell/components/FieldTypeDateTime/index.tsx b/src/shell/components/FieldTypeDateTime/index.tsx
index d46b82d59d..9e44c4eb25 100644
--- a/src/shell/components/FieldTypeDateTime/index.tsx
+++ b/src/shell/components/FieldTypeDateTime/index.tsx
@@ -78,7 +78,7 @@ export const FieldTypeDateTime = ({
       <FieldTypeDate
         name={name}
         required={required}
-        value={dateString ? new Date(dateString) : null}
+        value={dateString ? moment(dateString).toDate() : null}
         onChange={(date) => {
           if (date) {
             onChange(