diff --git a/app/client/src/components/propertyControls/DatePickerControl.tsx b/app/client/src/components/propertyControls/DatePickerControl.tsx
index d5e32628fd..da96d9abf8 100644
--- a/app/client/src/components/propertyControls/DatePickerControl.tsx
+++ b/app/client/src/components/propertyControls/DatePickerControl.tsx
@@ -4,6 +4,7 @@ import { StyledDatePicker } from "./StyledControls";
 import moment from "moment-timezone";
 import styled from "styled-components";
 import { TimePrecision } from "@blueprintjs/datetime";
+import BaseWidget, { WidgetProps } from "widgets/BaseWidget";
 
 const DatePickerControlWrapper = styled.div`
   display: flex;
@@ -36,17 +37,25 @@ class DatePickerControl extends BaseControl<
   DatePickerControlProps,
   DatePickerControlState
 > {
+  now = moment();
+  year = this.now.get("year");
+  maxDate: Date = this.now
+    .clone()
+    .set({ month: 11, date: 31, year: this.year + 20 })
+    .toDate();
+  minDate: Date = this.now
+    .clone()
+    .set({ month: 0, date: 1, year: this.year - 20 })
+    .toDate();
+
   constructor(props: DatePickerControlProps) {
     super(props);
     this.state = {
       selectedDate: props.propertyValue,
     };
   }
+
   render() {
-    const now = moment();
-    const year = now.get("year");
-    const minDate = now.clone().set({ month: 0, date: 1, year: year - 20 });
-    const maxDate = now.clone().set({ month: 11, date: 31, year: year + 20 });
     return (
       <DatePickerControlWrapper>
         <StyledDatePicker
@@ -57,11 +66,11 @@ class DatePickerControl extends BaseControl<
           timePrecision={TimePrecision.MINUTE}
           closeOnSelection
           onChange={this.onDateSelected}
-          maxDate={maxDate.toDate()}
-          minDate={minDate.toDate()}
+          maxDate={this.maxDate}
+          minDate={this.minDate}
           value={
             this.props.propertyValue
-              ? moment(this.props.propertyValue).toDate()
+              ? this.parseDate(this.props.propertyValue)
               : null
           }
         />
@@ -70,17 +79,22 @@ class DatePickerControl extends BaseControl<
   }
 
   onDateSelected = (date: Date): void => {
-    const selectedDate = date ? moment(date).toISOString(true) : undefined;
+    const selectedDate = date ? this.formatDate(date) : undefined;
     this.setState({ selectedDate: selectedDate });
     this.updateProperty(this.props.propertyName, selectedDate);
   };
 
   formatDate = (date: Date): string => {
-    return moment(date).format("DD/MM/YYYY HH:mm");
+    return moment(date).format(
+      this.props.widgetProperties.dateFormat || "DD/MM/YYYY HH:mm",
+    );
   };
 
   parseDate = (dateStr: string): Date => {
-    return moment(dateStr, "DD/MM/YYYY HH:mm").toDate();
+    return moment(
+      dateStr,
+      this.props.widgetProperties.dateFormat || "DD/MM/YYYY HH:mm",
+    ).toDate();
   };
 
   static getControlType() {
@@ -91,6 +105,7 @@ class DatePickerControl extends BaseControl<
 export interface DatePickerControlProps extends ControlProps {
   placeholderText: string;
   propertyValue: string;
+  widgetProperties: WidgetProps;
 }
 
 interface DatePickerControlState {
diff --git a/app/client/src/pages/Editor/PropertyPane/PropertyControl.tsx b/app/client/src/pages/Editor/PropertyPane/PropertyControl.tsx
index 64ee97bbc8..1bfcf64104 100644
--- a/app/client/src/pages/Editor/PropertyPane/PropertyControl.tsx
+++ b/app/client/src/pages/Editor/PropertyPane/PropertyControl.tsx
@@ -61,6 +61,7 @@ const PropertyControl = (props: Props) => {
       validationMessage,
       dataTreePath,
       evaluatedValue,
+      widgetProperties: widgetProperties,
       expected: FIELD_EXPECTED_VALUE[widgetProperties.type][propertyName],
     };
     const isDynamic: boolean = _.get(
diff --git a/app/client/src/utils/Validators.ts b/app/client/src/utils/Validators.ts
index 44dc1d8235..9bb34adcd7 100644
--- a/app/client/src/utils/Validators.ts
+++ b/app/client/src/utils/Validators.ts
@@ -387,7 +387,7 @@ export const VALIDATORS: Record<ValidationType, Validator> = {
     return { isValid, parsed };
   },
   [VALIDATION_TYPES.DATE]: (
-    value: string,
+    dateString: string,
     props: WidgetProps,
     dataTree?: DataTree,
   ): ValidationResponse => {
@@ -396,8 +396,10 @@ export const VALIDATORS: Record<ValidationType, Validator> = {
       .minute(0)
       .second(0)
       .millisecond(0);
-
-    if (value === undefined) {
+    const dateFormat = props.dateFormat ? props.dateFormat : moment.ISO_8601;
+    const dateStr = moment().toISOString();
+    const todayDateString = today.format(dateFormat);
+    if (dateString === undefined) {
       return {
         isValid: false,
         parsed: "",
@@ -407,8 +409,8 @@ export const VALIDATORS: Record<ValidationType, Validator> = {
             : "",
       };
     }
-    const isValid = moment(value, props.dateFormat).isValid();
-    const parsed = isValid ? value : today;
+    const isValid = moment(dateString, dateFormat).isValid();
+    const parsed = isValid ? dateString : todayDateString;
     return {
       isValid,
       parsed,