diff --git a/src/containers/Projects/containers/ProjectTaskFormDialog/ProjectTaskFormProvider.tsx b/src/containers/Projects/containers/ProjectTaskFormDialog/ProjectTaskFormProvider.tsx
index 8f417f1f3..dc38c22c9 100644
--- a/src/containers/Projects/containers/ProjectTaskFormDialog/ProjectTaskFormProvider.tsx
+++ b/src/containers/Projects/containers/ProjectTaskFormDialog/ProjectTaskFormProvider.tsx
@@ -36,6 +36,7 @@ function ProjectTaskFormProvider({
   const provider = {
     dialogName,
     isNewMode,
+    taskId,
     projectId,
     projectTask,
     createProjectTaskMutate,
diff --git a/src/containers/Projects/hooks/projectsTask.tsx b/src/containers/Projects/hooks/projectsTask.tsx
index 1acfcbc5e..e5bc282ff 100644
--- a/src/containers/Projects/hooks/projectsTask.tsx
+++ b/src/containers/Projects/hooks/projectsTask.tsx
@@ -42,10 +42,11 @@ export function useEditProjectTask(props) {
 
   return useMutation(([id, values]) => apiRequest.post(`tasks/${id}`, values), {
     onSuccess: (res, [id, values]) => {
+      // Common invalidate queries.
+      commonInvalidateQueries(queryClient);
+
       // Invalidate specific project task.
       queryClient.invalidateQueries([t.PROJECT_TASK, id]);
-
-      commonInvalidateQueries(queryClient);
     },
     ...props,
   });