diff --git a/components/DatePicker/index.tsx b/components/DatePicker/index.tsx
index 962a8fc96..ca4fec3bd 100644
--- a/components/DatePicker/index.tsx
+++ b/components/DatePicker/index.tsx
@@ -47,7 +47,7 @@ export default function DatePickerForm({ name = "date" }: DatePickerFormProps) {
     if (!dt(selected).isBefore(dt(), "day")) {
       if (isSelectingFrom) {
         setValue(name, {
-          fromDate: dt(selected).format("YYYY-MM-DD"),
+          fromDate: dt(selected).format("YYYY-MM-D"),
           toDate: undefined,
         })
         setIsSelectingFrom(false)
@@ -57,11 +57,11 @@ export default function DatePickerForm({ name = "date" }: DatePickerFormProps) {
         if (toDate.isAfter(fromDate)) {
           setValue(name, {
             fromDate: selectedDate.fromDate,
-            toDate: toDate.format("YYYY-MM-DD"),
+            toDate: toDate.format("YYYY-MM-D"),
           })
         } else {
           setValue(name, {
-            fromDate: toDate.format("YYYY-MM-DD"),
+            fromDate: toDate.format("YYYY-MM-D"),
             toDate: selectedDate.fromDate,
           })
         }
@@ -75,9 +75,7 @@ export default function DatePickerForm({ name = "date" }: DatePickerFormProps) {
         if (!selectedDate.toDate) {
           setValue(name, {
             fromDate: selectedDate.fromDate,
-            toDate: dt(selectedDate.fromDate)
-              .add(1, "day")
-              .format("YYYY-MM-DD"),
+            toDate: dt(selectedDate.fromDate).add(1, "day").format("YYYY-MM-D"),
           })
           setIsSelectingFrom(true)
         }
diff --git a/components/TempDesignSystem/Form/Date/index.tsx b/components/TempDesignSystem/Form/Date/index.tsx
index 4e8f4a7af..3712cb94b 100644
--- a/components/TempDesignSystem/Form/Date/index.tsx
+++ b/components/TempDesignSystem/Form/Date/index.tsx
@@ -83,7 +83,7 @@ export default function DateSelect({ name, registerOptions = {} }: DateProps) {
         .date(Number(day))
 
       if (newDate.isValid()) {
-        setValue(name, newDate.format("YYYY-MM-DD"), {
+        setValue(name, newDate.format("YYYY-MM-D"), {
           shouldDirty: true,
           shouldTouch: true,
           shouldValidate: true,
diff --git a/next.config.js b/next.config.js
index 2e8553f1c..c65772ab7 100644
--- a/next.config.js
+++ b/next.config.js
@@ -137,7 +137,7 @@ const nextConfig = {
           {
             key: "fromDate",
             type: "query",
-            value: "^([12]\\d{3}-(0[1-9]|1[0-2])-(0[1-9]|[12]\\d|3[01]))$",
+            value: "^([12]\\d{3}-(0[1-9]|1[0-2])-([1-9]|[12]\\d|3[01]))$",
           },
         ],
         permanent: false,
@@ -169,7 +169,7 @@ const nextConfig = {
           {
             key: "toDate",
             type: "query",
-            value: "^([12]\\d{3}-(0[1-9]|1[0-2])-(0[1-9]|[12]\\d|3[01]))$",
+            value: "^([12]\\d{3}-(0[1-9]|1[0-2])-([1-9]|[12]\\d|3[01]))$",
           },
         ],
         permanent: false,
diff --git a/server/routers/hotels/query.ts b/server/routers/hotels/query.ts
index 39771b1c8..882eefb6b 100644
--- a/server/routers/hotels/query.ts
+++ b/server/routers/hotels/query.ts
@@ -974,11 +974,10 @@ export const hotelQueryRouter = router({
         const { lang } = ctx
 
         const apiLang = toApiLang(lang)
-
         const params = {
           Adults: input.adults,
-          EndDate: dt(input.toDate).format("YYYY-MM-DD"),
-          StartDate: dt(input.fromDate).format("YYYY-MM-DD"),
+          EndDate: dt(input.toDate).format("YYYY-MM-D"),
+          StartDate: dt(input.fromDate).format("YYYY-MM-D"),
           language: apiLang,
         }