diff --git a/components/pages/calendar/ManuallyAddEventModal.tsx b/components/pages/calendar/ManuallyAddEventModal.tsx
index aacb252..fc420c8 100644
--- a/components/pages/calendar/ManuallyAddEventModal.tsx
+++ b/components/pages/calendar/ManuallyAddEventModal.tsx
@@ -317,8 +317,15 @@ export const ManuallyAddEventModal = () => {
                             </View>
                             <DateTimePicker
                                 value={startTime}
-                                onChange={(date) => setStartTime(date)}
-                                maximumDate={endTime}
+                                onChange={(time) =>  {
+                                    if (time <= endTime) {
+                                        setStartTime(time)
+                                    } else {
+                                        const currentTime = new Date();
+                                        currentTime.setSeconds(0, 0);
+                                        setStartTime(currentTime);
+                                    }
+                                }}
                                 minuteInterval={5}
                                 dateTimeFormatter={(date, mode) =>
                                     date.toLocaleTimeString("en-us", {
@@ -355,7 +362,15 @@ export const ManuallyAddEventModal = () => {
                                 </View>
                                 <DateTimePicker
                                     value={endTime}
-                                    onChange={(date) => setEndTime(date)}
+                                    onChange={(time) => {
+                                        if (time >= endTime) {
+                                            setEndTime(time);
+                                        } else {
+                                            const currentTime = new Date();
+                                            currentTime.setSeconds(0, 0);
+                                            setEndTime(currentTime);
+                                        }
+                                    }}
                                     minimumDate={startTime}
                                     minuteInterval={5}
                                     dateTimeFormatter={(date, mode) =>