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 e39ef5de0..da37487b3 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
@@ -328,7 +328,7 @@ export function TaskUpsertModalContainer({ bodyshop, currentUser, taskUpsert, to
           loading={loading || (taskId && taskLoading)}
           error={error}
           data={data}
-          existingTask={existingTask}
+          existingTask={existingTask || taskData?.tasks_by_pk}
           selectedJobId={selectedJobId}
           setSelectedJobId={setSelectedJobId}
           selectedJobDetails={selectedJobDetails}