diff --git a/client-reactjs/src/components/application/jobMonitoring/AddEditJobMonitoringModal.jsx b/client-reactjs/src/components/application/jobMonitoring/AddEditJobMonitoringModal.jsx
index 4d393b92d..081f0e815 100644
--- a/client-reactjs/src/components/application/jobMonitoring/AddEditJobMonitoringModal.jsx
+++ b/client-reactjs/src/components/application/jobMonitoring/AddEditJobMonitoringModal.jsx
@@ -107,9 +107,9 @@ const AddEditJobMonitoringModal = ({
   };
 
   const handleCancel = () => {
+    form.resetFields();
     setIntermittentScheduling({ schedulingType: 'daily', id: uuidv4() });
     setCompleteSchedule([]);
-    form.resetFields();
     setDisplayAddJobMonitoringModal(false);
     setActiveTab('0');
     setVisitedTabs(['0']);
@@ -117,6 +117,8 @@ const AddEditJobMonitoringModal = ({
     setEditingData({ isEditing: false });
     setErroneousTabs([]);
     setErroneousScheduling(false);
+    setActiveTab('0');
+    setMonitoringScope(null);
   };
 
   //Render footer buttons based on active tab
diff --git a/server/routes/jobmonitoring/read.js b/server/routes/jobmonitoring/read.js
index 7bbaab8d5..e4d334f57 100644
--- a/server/routes/jobmonitoring/read.js
+++ b/server/routes/jobmonitoring/read.js
@@ -102,6 +102,7 @@ router.post(
         // Validate the req.body
         const errors = validationResult(req);
         if (!errors.isEmpty()) {
+          logger.error(errors);
           return res.status(400).json({ errors: errors.array() });
         }
 
@@ -113,11 +114,22 @@ router.post(
         payload.approvedAt = null;
 
         //Update the job monitoring
-        await JobMonitoring.update(req.body, {
+        const updatedRows = await JobMonitoring.update(req.body, {
           where: { id: req.body.id },
+          returning: true,
         });
-        res.status(200).send(payload);
+
+        //If no rows were updated, then the job monitoring does not exist
+        if (updatedRows[0] === 0) {
+          return res.status(404).send("Job monitoring not found");
+        }
+
+        //If updated - Get the updated job monitoring
+        const updatedJob = await JobMonitoring.findByPk(req.body.id);
+        res.status(200).send(updatedJob);
+
       } catch (err) {
+        console.log(err)
         logger.error(err);
         res.status(500).send("Failed to update job monitoring");
       }