diff --git a/client/src/components/task-upsert-modal/task-upsert-modal.container.jsx b/client/src/components/task-upsert-modal/task-upsert-modal.container.jsx
index 5da4ae224..e39ef5de0 100644
--- a/client/src/components/task-upsert-modal/task-upsert-modal.container.jsx
+++ b/client/src/components/task-upsert-modal/task-upsert-modal.container.jsx
@@ -109,8 +109,18 @@ export function TaskUpsertModalContainer({ bodyshop, currentUser, taskUpsert, to
   /**
    * Handle refetch queries
    * @param taskObject
+   * @param jobId
    */
-  const handleRefetchQueries = (taskObject) => {
+  const handleRefetchQueries = (taskObject, jobId) => {
+    if (location.pathname.includes("/manage/jobs") && jobId) {
+      taskObject.refetchQueries.push({
+        query: GET_JOB_BY_PK,
+        variables: {
+          id: jobId
+        }
+      });
+    }
+
     if (query && Object.keys(query).length) {
       taskObject.refetchQueries.push(Object.keys(query)[0]);
     } else {
@@ -138,15 +148,16 @@ export function TaskUpsertModalContainer({ bodyshop, currentUser, taskUpsert, to
       refetchQueries: []
     };
 
-    // We need to make sure this is updated everywhere
-    taskObject.refetchQueries.push({
-      query: GET_JOB_BY_PK,
-      variables: {
-        id: jobId
-      }
-    });
+    if (location.pathname.includes("/manage/jobs") && jobId) {
+      taskObject.refetchQueries.push({
+        query: GET_JOB_BY_PK,
+        variables: {
+          id: jobId
+        }
+      });
+    }
 
-    handleRefetchQueries(taskObject);
+    handleRefetchQueries(taskObject, jobId);
 
     const taskData = await updateTask(taskObject);
 
@@ -210,16 +221,7 @@ export function TaskUpsertModalContainer({ bodyshop, currentUser, taskUpsert, to
       refetchQueries: []
     };
 
-    // We need to make sure this is updated everywhere
-    taskObject.refetchQueries.push({
-      query: GET_JOB_BY_PK,
-      variables: {
-        id: values.jobid
-      }
-    });
-
-    // We have a relationship query, so we need to refetch the query
-    handleRefetchQueries(taskObject);
+    handleRefetchQueries(taskObject, values.jobid);
 
     const newTaskData = await insertTask(taskObject);
     const newTask = newTaskData?.data?.insert_tasks?.returning[0];