diff --git a/app/components/DateInput.tsx b/app/components/DateInput.tsx
index 3caf43d4f..a34c407c9 100644
--- a/app/components/DateInput.tsx
+++ b/app/components/DateInput.tsx
@@ -1,5 +1,5 @@
 import { useIsMounted } from "~/hooks/useIsMounted";
-import { dateToYearMonthDayHourMinuteString } from "~/utils/dates";
+import { dateToYearMonthDayHourMinuteString, isValidDate } from "~/utils/dates";
 import * as React from "react";
 
 export function DateInput({
@@ -9,6 +9,7 @@ export function DateInput({
   min,
   max,
   required,
+  onChange,
 }: {
   id?: string;
   name?: string;
@@ -16,6 +17,7 @@ export function DateInput({
   min?: Date;
   max?: Date;
   required?: boolean;
+  onChange?: (newDate: Date) => void;
 }) {
   const [date, setDate] = React.useState(defaultValue ?? new Date());
   const isMounted = useIsMounted();
@@ -41,7 +43,20 @@ export function DateInput({
         value={dateToYearMonthDayHourMinuteString(date)}
         min={min ? dateToYearMonthDayHourMinuteString(min) : undefined}
         max={max ? dateToYearMonthDayHourMinuteString(max) : undefined}
-        onChange={(e) => setDate(new Date(e.target.value))}
+        onChange={(e) => {
+          //TODO: fix invalid Date Input handling: https://github.com/Sendouc/sendou.ink/issues/1082
+          const updatedDate = new Date(e.target.value);
+          if (!isValidDate(updatedDate)) {
+            console.warn("Invalid date");
+            // throw new RangeError("Invalid Date");
+          }
+          setDate(updatedDate);
+
+          // Update the correct entry in the React hook from the parent via the passed on callback function
+          if (typeof onChange !== "undefined") {
+            onChange(updatedDate);
+          }
+        }}
         required={required}
       />
     </>
diff --git a/app/routes/calendar/new.tsx b/app/routes/calendar/new.tsx
index c28563c90..c7505d4af 100644
--- a/app/routes/calendar/new.tsx
+++ b/app/routes/calendar/new.tsx
@@ -31,8 +31,9 @@ import { canEditCalendarEvent } from "~/permissions";
 import calendarNewStyles from "~/styles/calendar-new.css";
 import mapsStyles from "~/styles/maps.css";
 import {
-  databaseTimestampToDate,
   dateToDatabaseTimestamp,
+  databaseTimestampToDate,
+  getDateWithHoursOffset,
 } from "~/utils/dates";
 import {
   badRequestIfFalsy,
@@ -288,14 +289,31 @@ function DescriptionTextarea() {
 function DatesInput() {
   const { t } = useTranslation(["common", "calendar"]);
   const { eventToEdit } = useLoaderData<typeof loader>();
-  const [datesCount, setDatesCount] = React.useState(
-    eventToEdit?.startTimes.length ?? 1
-  );
-  const isMounted = useIsMounted();
 
+  // Initialize datesInputState by retrieving pre-existing events if they exist
+  let eventDatesInputState = null;
+  if (typeof eventToEdit?.startTimes !== "undefined") {
+    eventDatesInputState = eventToEdit.startTimes.map((t) => {
+      return { finalDateInputDate: databaseTimestampToDate(t) };
+    });
+  }
+
+  // React hook that keeps contains an array of parameters that corresponds to each DateInput child object generated
+  const [datesInputState, setDatesInputState] = React.useState(
+    eventDatesInputState ?? [
+      {
+        finalDateInputDate: new Date(),
+      },
+    ]
+  );
+
+  const datesCount = datesInputState.length;
+
+  const isMounted = useIsMounted();
   const usersTimeZone = isMounted
     ? Intl.DateTimeFormat().resolvedOptions().timeZone
     : "";
+  const NEW_CALENDAR_EVENT_HOURS_OFFSET = 24;
 
   return (
     <div className="stack md items-start">
@@ -304,38 +322,58 @@ function DatesInput() {
           {t("calendar:forms.dates")}
         </Label>
         <div className="stack sm">
-          {new Array(datesCount).fill(null).map((_, i) => {
-            const defaultStartTime = eventToEdit?.startTimes[i];
-
+          {datesInputState.map((inputState, i) => {
             return (
               <div key={i} className="stack horizontal sm items-center">
                 <DateInput
                   id="date"
                   name="date"
-                  defaultValue={
-                    defaultStartTime
-                      ? databaseTimestampToDate(defaultStartTime)
-                      : undefined
-                  }
+                  defaultValue={inputState.finalDateInputDate ?? new Date()}
                   min={MIN_DATE}
                   max={MAX_DATE}
                   required
+                  onChange={(newDate: Date) => {
+                    setDatesInputState((current) =>
+                      current.map((obj, objIndex) => {
+                        if (objIndex === i) {
+                          return { ...obj, finalDateInputDate: newDate };
+                        }
+
+                        return obj;
+                      })
+                    );
+                  }}
                 />
                 {i === datesCount - 1 && (
                   <>
+                    {/* "Add" button */}
                     <Button
                       tiny
                       disabled={
                         datesCount === CALENDAR_EVENT.MAX_AMOUNT_OF_DATES
                       }
-                      onClick={() => setDatesCount((count) => count + 1)}
+                      onClick={() => {
+                        setDatesInputState((current) => [
+                          ...current,
+                          {
+                            finalDateInputDate: getDateWithHoursOffset(
+                              inputState.finalDateInputDate,
+                              NEW_CALENDAR_EVENT_HOURS_OFFSET
+                            ),
+                          },
+                        ]);
+                      }}
                     >
                       {t("common:actions.add")}
                     </Button>
+
+                    {/* "Remove" button */}
                     {datesCount > 1 && (
                       <Button
                         tiny
-                        onClick={() => setDatesCount((count) => count - 1)}
+                        onClick={() => {
+                          setDatesInputState((current) => current.slice(0, -1));
+                        }}
                         variant="destructive"
                       >
                         {t("common:actions.remove")}
diff --git a/app/utils/dates.ts b/app/utils/dates.ts
index c3270c6bc..057eeef69 100644
--- a/app/utils/dates.ts
+++ b/app/utils/dates.ts
@@ -34,13 +34,32 @@ export function weekNumberToDate({
   return result;
 }
 
+/**
+ * Checks if a date is valid or not.
+ *
+ * Returns:
+ * - True if date is valid
+ * - False otherwise
+ */
+export function isValidDate(date: Date) {
+  return !isNaN(date.getTime());
+}
+
 /** Returns date as a string with the format YYYY-MM-DDThh:mm in user's time zone */
 export function dateToYearMonthDayHourMinuteString(date: Date) {
-  const year = date.getFullYear();
-  const month = date.getMonth() + 1;
-  const day = date.getDate();
-  const hour = date.getHours();
-  const minute = date.getMinutes();
+  const copiedDate = new Date(date.getTime());
+
+  //TODO: fix invalid Date Input handling: https://github.com/Sendouc/sendou.ink/issues/1082
+  if (!isValidDate(copiedDate)) {
+    console.warn("Invalid date");
+    // throw new RangeError("Invalid Date");
+  }
+
+  const year = copiedDate.getFullYear();
+  const month = copiedDate.getMonth() + 1;
+  const day = copiedDate.getDate();
+  const hour = copiedDate.getHours();
+  const minute = copiedDate.getMinutes();
 
   return `${year}-${prefixZero(month)}-${prefixZero(day)}T${prefixZero(
     hour
@@ -50,3 +69,15 @@ export function dateToYearMonthDayHourMinuteString(date: Date) {
 function prefixZero(number: number) {
   return number < 10 ? `0${number}` : number;
 }
+
+/**
+ * Retrieves a new Date object that is offset by several hours.
+ *
+ * NOTE: it is important that we work with & return a copy of the date here,
+ *  otherwise we will just be mutating the original date passed into this function.
+ */
+export function getDateWithHoursOffset(date: Date, hoursOffset: number) {
+  const copiedDate = new Date(date.getTime());
+  copiedDate.setHours(date.getHours() + hoursOffset);
+  return copiedDate;
+}