diff --git a/code/09 Practice Project - Project Management/09-managing-tasks/src/App.jsx b/code/09 Practice Project - Project Management/09-managing-tasks/src/App.jsx
index 75cee1704..d8d33e332 100644
--- a/code/09 Practice Project - Project Management/09-managing-tasks/src/App.jsx	
+++ b/code/09 Practice Project - Project Management/09-managing-tasks/src/App.jsx	
@@ -96,13 +96,20 @@ function App() {
     (project) => project.id === projectsState.selectedProjectId
   );
 
+  const projectTasks =
+  selectedProject != undefined
+    ? projectsState.tasks.filter(
+        (task) => task.projectId == selectedProject.id
+      )
+    : [];
+
   let content = (
     <SelectedProject
       project={selectedProject}
       onDelete={handleDeleteProject}
       onAddTask={handleAddTask}
       onDeleteTask={handleDeleteTask}
-      tasks={projectsState.tasks}
+      tasks={projectTasks}
     />
   );
 
diff --git a/code/09 Practice Project - Project Management/10-finished/src/App.jsx b/code/09 Practice Project - Project Management/10-finished/src/App.jsx
index 3e2513dc4..f1a69e4d0 100644
--- a/code/09 Practice Project - Project Management/10-finished/src/App.jsx	
+++ b/code/09 Practice Project - Project Management/10-finished/src/App.jsx	
@@ -96,13 +96,20 @@ function App() {
     (project) => project.id === projectsState.selectedProjectId
   );
 
+  const projectTasks =
+  selectedProject != undefined
+    ? projectsState.tasks.filter(
+        (task) => task.projectId == selectedProject.id
+      )
+    : [];
+
   let content = (
     <SelectedProject
       project={selectedProject}
       onDelete={handleDeleteProject}
       onAddTask={handleAddTask}
       onDeleteTask={handleDeleteTask}
-      tasks={projectsState.tasks}
+      tasks={projectTasks}
     />
   );