diff --git a/client/.eslintrc b/client/.eslintrc
index cc0f939b4..25e7bdb80 100644
--- a/client/.eslintrc
+++ b/client/.eslintrc
@@ -1,5 +1,8 @@
 {
   "extends": [
     "react-app"
-  ]
+  ],
+  "rules": {
+    "no-useless-rename": "off"
+  }
 }
diff --git a/client/src/components/task-list/task-list.component.jsx b/client/src/components/task-list/task-list.component.jsx
index b6de88ab1..75100e0e3 100644
--- a/client/src/components/task-list/task-list.component.jsx
+++ b/client/src/components/task-list/task-list.component.jsx
@@ -243,15 +243,15 @@ function TaskListComponent({
     filteredInfo: {text: ""},
   });
 
-  const handleCreateTask = () => {
-    setTaskUpsertContext({
-      actions: {},
-      context: {
-        jobid: parentJobId,
-        [relationshipType]: relationshipId,
-      },
-    });
-  };
+  const handleCreateTask = useCallback(() => {
+      setTaskUpsertContext({
+        actions: {},
+        context: {
+          jobid: parentJobId,
+          [relationshipType]: relationshipId,
+        },
+      });
+  }, [ parentJobId, relationshipId, relationshipType, setTaskUpsertContext]);
 
   const handleTableChange = (pagination, filters, sorter) => {
     setState({...state, filteredInfo: filters, sortedInfo: sorter});
@@ -261,14 +261,14 @@ function TaskListComponent({
     history({search: queryString.stringify(search)});
   };
 
-  const handleSwitchChange = (param, value) => {
+  const handleSwitchChange = useCallback((param, value) => {
     if (value) {
       search[param] = "true";
     } else {
       delete search[param];
     }
     history({search: queryString.stringify(search)});
-  };
+  }, [history, search]);
 
   const expandableRow = (record) => {
     return <Card title={t('tasks.fields.description')} size='small'>
@@ -315,7 +315,7 @@ function TaskListComponent({
         </Button>
       </Space>
     );
-  }, [refetch, deleted, completed, mine]);
+  }, [refetch, deleted, completed, mine, onlyMine, t, handleSwitchChange, handleCreateTask]);
 
   return (
     <Card
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 af3f21210..e792b0c0c 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
@@ -47,9 +47,9 @@ export function TaskUpsertModalContainer({
   const [jobIdState, setJobIdState] = useState(null);
 
   const {
-    loading: loading,
-    error: error,
-    data: data
+    loading,
+    error,
+    data
   } = useQuery(QUERY_GET_TASKS_JOB_DETAILS_BY_ID, {
     variables: {id: jobIdState},
     skip: !jobIdState,
@@ -70,7 +70,7 @@ export function TaskUpsertModalContainer({
       form.setFieldsValue(taskData.tasks_by_pk);
       setSelectedJobId(taskData.tasks_by_pk.jobid);
     }
-  }, [taskLoading, taskError, taskData]);
+  }, [taskLoading, taskError, taskData, form]);
 
   // Use Effect to hydrate selected job details
   useEffect(() => {
diff --git a/client/src/pages/tasks/tasks.page.component.jsx b/client/src/pages/tasks/tasks.page.component.jsx
index b54d00e6a..fce879c4c 100644
--- a/client/src/pages/tasks/tasks.page.component.jsx
+++ b/client/src/pages/tasks/tasks.page.component.jsx
@@ -14,6 +14,8 @@ export default function TasksPageComponent({bodyshop, currentUser, type}) {
       return <TaskListContainer query={QUERY_ALL_TASKS_PAGINATED} bodyshop={bodyshop}
                                 titleTranslation={'tasks.titles.all_tasks'}
                                 currentUser={currentUser}/>
+    default:
+      return <></>
   }
 
 }