diff --git a/epictrack-web/src/components/workPlan/event/EventForm.tsx b/epictrack-web/src/components/workPlan/event/EventForm.tsx
index 6efabafa8..f87b0e5e1 100644
--- a/epictrack-web/src/components/workPlan/event/EventForm.tsx
+++ b/epictrack-web/src/components/workPlan/event/EventForm.tsx
@@ -416,7 +416,6 @@ const EventForm = ({
 
   const onSubmitHandler = async (submittedData: MilestoneEvent) => {
     try {
-      submittedData.notes = notes;
       const pushRequired = dateCheckStatus?.subsequent_event_push_required;
       if (pushRequired) {
         setShowEventPushConfirmation(pushRequired);
@@ -491,38 +490,39 @@ const EventForm = ({
     },
     [event, pushEvents]
   );
-  const handleSaveEvent = useCallback(
-    async (
-      data?: MilestoneEvent,
-      pushEventConfirmed = false,
-      confirmSaveInLocked = false
-    ) => {
-      try {
-        const dataToBeSubmitted = data ?? getValues();
-        if (showLockConfirmDialog(dataToBeSubmitted) && !confirmSaveInLocked) {
-          setShowEventLockDialog(true);
-        } else {
-          dataToBeSubmitted.anticipated_date = Moment(
-            dataToBeSubmitted.anticipated_date
+  const handleSaveEvent = async (
+    data?: MilestoneEvent,
+    pushEventConfirmed = false,
+    confirmSaveInLocked = false
+  ) => {
+    try {
+      const formData = data ?? getValues();
+      const dataToBeSubmitted = {
+        ...formData,
+        notes: notes,
+      };
+      if (showLockConfirmDialog(dataToBeSubmitted) && !confirmSaveInLocked) {
+        setShowEventLockDialog(true);
+      } else {
+        dataToBeSubmitted.anticipated_date = Moment(
+          dataToBeSubmitted.anticipated_date
+        ).format();
+        if (!!dataToBeSubmitted.actual_date) {
+          dataToBeSubmitted.actual_date = Moment(
+            dataToBeSubmitted.actual_date
           ).format();
-          if (!!dataToBeSubmitted.actual_date) {
-            dataToBeSubmitted.actual_date = Moment(
-              dataToBeSubmitted.actual_date
-            ).format();
-          }
-          await saveEvent(dataToBeSubmitted, pushEventConfirmed);
-          onSave();
-          setDateCheckStatus(undefined);
         }
-      } catch (e) {
-        const message = getErrorMessage(e);
-        showNotification(message, {
-          type: "error",
-        });
+        await saveEvent(dataToBeSubmitted, pushEventConfirmed);
+        onSave();
+        setDateCheckStatus(undefined);
       }
-    },
-    [pushEvents, event]
-  );
+    } catch (e) {
+      const message = getErrorMessage(e);
+      showNotification(message, {
+        type: "error",
+      });
+    }
+  };
 
   const onChangeMilestoneType = (configuration_id: number) => {
     const configuration = configurations.filter(