diff --git a/components/TempDesignSystem/Form/Date/index.tsx b/components/TempDesignSystem/Form/Date/index.tsx
index a2c87401b..a0930a3a7 100644
--- a/components/TempDesignSystem/Form/Date/index.tsx
+++ b/components/TempDesignSystem/Form/Date/index.tsx
@@ -32,10 +32,12 @@ export default function DateSelect({ name, registerOptions = {} }: DateProps) {
     year: number | null
     month: number | null
     date: number | null
+    daysInMonth: number
   }>({
     year: null,
     month: null,
     date: null,
+    daysInMonth: 31,
   })
 
   const currentYear = new Date().getFullYear()
@@ -57,12 +59,24 @@ export default function DateSelect({ name, registerOptions = {} }: DateProps) {
         selector === DateName.month ? Number(select) - 1 : Number(select)
       const newSegments = { ...dateSegments, [selector]: value }
 
+      /**
+       * Update daysInMonth when year or month changes
+       * to ensure the user can't select a date that doesn't exist.
+       */
+      if (selector === DateName.year || selector === DateName.month) {
+        const year = selector === DateName.year ? value : newSegments.year
+        const month = selector === DateName.month ? value : newSegments.month
+        if (year !== null && month !== null) {
+          newSegments.daysInMonth = dt().year(year).month(month).daysInMonth()
+        }
+      }
+
       if (Object.values(newSegments).every((val) => val !== null)) {
         const newDate = dt()
           .utc()
           .set("year", newSegments.year!)
           .set("month", newSegments.month!)
-          .set("date", newSegments.date!)
+          .set("date", Math.min(newSegments.date!, newSegments.daysInMonth))
 
         setValue(name, newDate.format("YYYY-MM-DD"))
       }
@@ -100,16 +114,11 @@ export default function DateSelect({ name, registerOptions = {} }: DateProps) {
           {(segment) => {
             switch (segment.type) {
               case "day":
-                let days = []
-                if (segment.maxValue && segment.minValue) {
-                  days = rangeArray(segment.minValue, segment.maxValue).map(
-                    (day) => ({ value: day, label: `${day}` })
-                  )
-                } else {
-                  days = Array.from(Array(segment.maxValue).keys()).map(
-                    (i) => ({ value: i + 1, label: `${i + 1}` })
-                  )
-                }
+                const maxDays = dateSegments.daysInMonth
+                const days = rangeArray(1, maxDays).map((day) => ({
+                  value: day,
+                  label: `${day}`,
+                }))
                 return (
                   <div className={styles.day}>
                     <Select