diff --git a/src/App.js b/src/App.js
index cfb10c9..43cbd4a 100644
--- a/src/App.js
+++ b/src/App.js
@@ -47,7 +47,7 @@ function App() {
             exact
             path="/tabs"
             render={() => (
-              <TaskTabs list message="No results found. Adjust the search keyword." />
+              <TaskTabs taskList message="No results found. Adjust the search keyword." />
             )}
           />
           <Route
diff --git a/src/pages/tasks/Task.js b/src/pages/tasks/Task.js
index 86f7fa3..877155e 100644
--- a/src/pages/tasks/Task.js
+++ b/src/pages/tasks/Task.js
@@ -46,6 +46,7 @@ const Task = (props) => {
     watched_id,
     watchers_count,
     taskDetail,
+    taskList,
     setTasks,
   } = props;
 
diff --git a/src/pages/tasks/TaskKanban.js b/src/pages/tasks/TaskKanban.js
index ba1636d..bc40c78 100644
--- a/src/pages/tasks/TaskKanban.js
+++ b/src/pages/tasks/TaskKanban.js
@@ -20,7 +20,7 @@ import NoResults from "../../assets/no-results.png";
 import { useCurrentUser } from "../../contexts/CurrentUserContext";
 import { Link } from "react-router-dom/cjs/react-router-dom.min";
 
-function TaskKanban({ message, filter = "" }) {
+function TaskKanban({ message, filter = "", taskList }) {
   const [tasks, setTasks] = useState({ results: [] });
   const [hasLoaded, setHasLoaded] = useState(false);
   const { pathname } = useLocation();
@@ -93,7 +93,11 @@ function TaskKanban({ message, filter = "" }) {
                       children={tasks.results.map(
                         (task) =>
                           task.status === "TO-DO" && (
-                            <Task key={task.id} {...task} setTasks={setTasks} />
+                            <Task 
+                              key={task.id} {...task} 
+                              setTasks={setTasks} 
+                              taskList={taskList}
+                            />
                           )
                       )}
                       dataLength={tasks.results.length}
@@ -119,7 +123,11 @@ function TaskKanban({ message, filter = "" }) {
                       children={tasks.results.map(
                         (task) =>
                           task.status === "IN-PROGRESS" && (
-                            <Task key={task.id} {...task} setTasks={setTasks} />
+                            <Task 
+                              key={task.id} {...task} 
+                              setTasks={setTasks} 
+                              taskList={taskList}
+                            />
                           )
                       )}
                       dataLength={tasks.results.length}
@@ -145,7 +153,11 @@ function TaskKanban({ message, filter = "" }) {
                       children={tasks.results.map(
                         (task) =>
                           task.status === "DONE" && (
-                            <Task key={task.id} {...task} setTasks={setTasks} />
+                            <Task 
+                              key={task.id} {...task} 
+                              setTasks={setTasks} 
+                              taskList={taskList}
+                            />
                           )
                       )}
                       dataLength={tasks.results.length}
diff --git a/src/pages/tasks/TaskList.js b/src/pages/tasks/TaskList.js
index 617ff5d..6e315ba 100644
--- a/src/pages/tasks/TaskList.js
+++ b/src/pages/tasks/TaskList.js
@@ -18,7 +18,7 @@ import NoResults from "../../assets/no-results.png";
 // import ProfileList from "../profiles/ProfileList";
 import { useCurrentUser } from "../../contexts/CurrentUserContext";
 
-function TaskList({ message, filter = "" }) {
+function TaskList({ message, filter = "" , taskList}) {
   const [tasks, setTasks] = useState({ results: [] });
   const [hasLoaded, setHasLoaded] = useState(false);
   const { pathname } = useLocation();
@@ -69,7 +69,11 @@ function TaskList({ message, filter = "" }) {
             {tasks.results.length ? (
               <InfiniteScroll
                 children={tasks.results.map((task) => (
-                  <Task key={task.id} {...task} setTasks={setTasks} />
+                  <Task 
+                    key={task.id} {...task} 
+                    setTasks={setTasks} 
+                    taskList={taskList}
+                  />
                 ))}
                 dataLength={tasks.results.length}
                 loader={<Asset spinner />}
diff --git a/src/pages/tasks/TaskTabs.js b/src/pages/tasks/TaskTabs.js
index df2e0b2..20cb504 100644
--- a/src/pages/tasks/TaskTabs.js
+++ b/src/pages/tasks/TaskTabs.js
@@ -14,9 +14,9 @@ import { axiosReq } from "../../api/axiosDefaults";
 
 function TaskTabs(props) {
   const {
-    list
+    taskList
   } = props;
-  const TaskComponent = list ? TaskList : TaskKanban
+  const TaskComponent = taskList ? TaskList : TaskKanban
   
   const currentUser = useCurrentUser();
   const profile_id = currentUser?.profile_id || "";
@@ -57,6 +57,7 @@ function TaskTabs(props) {
             `}
           >
             <TaskComponent
+              taskList={taskList}
               message="No results found. Adjust the search keyword assign a task to yourself."
               filter={`assignee__profile=${profile_id}&ordering=-updated_at&`}
             />
@@ -69,6 +70,7 @@ function TaskTabs(props) {
             `}
           >
             <TaskComponent
+              taskList={taskList}
               message="No results found. Adjust the search keyword or watch a task."
               filter={`watched__owner__profile=${profile_id}&ordering=-watchers__created_at&`}
             />
@@ -81,6 +83,7 @@ function TaskTabs(props) {
             `}
           >
             <TaskComponent
+              taskList={taskList}
               message="No results found. Adjust the search keyword or create a task."
               filter={`owner__profile=${profile_id}&ordering=-created_at&`}
             />
@@ -91,11 +94,14 @@ function TaskTabs(props) {
               All tasks
             `}
           >
-            <TaskComponent message="No results found. Adjust the search keyword." />
+            <TaskComponent 
+              taskList={taskList}
+              message="No results found. Adjust the search keyword." 
+            />
           </Tab>
         </Tabs>
       </Col>
-      {list && (<Col md={4} className="d-none d-lg-block p-0 p-lg-2">
+      {taskList && (<Col md={4} className="d-none d-lg-block p-0 p-lg-2">
         <ProfileList />
       </Col>)}
     </Row>