diff --git a/components/DatePicker/index.tsx b/components/DatePicker/index.tsx
index 803f01e1b..bd19f684f 100644
--- a/components/DatePicker/index.tsx
+++ b/components/DatePicker/index.tsx
@@ -67,8 +67,8 @@ export default function DatePickerForm({
         setIsSelectingFrom(true)
       } else {
         setValue(name, {
-          from: selectedDate.from,
-          to: undefined,
+          from: toDate.format("YYYY-MM-DD"),
+          to: selectedDate.from,
         })
       }
     }