diff --git a/osinaweb/osinacore/api/__pycache__/urls.cpython-313.pyc b/osinaweb/osinacore/api/__pycache__/urls.cpython-313.pyc
index 5fb250af..3ae4083e 100644
Binary files a/osinaweb/osinacore/api/__pycache__/urls.cpython-313.pyc and b/osinaweb/osinacore/api/__pycache__/urls.cpython-313.pyc differ
diff --git a/osinaweb/osinacore/api/__pycache__/views.cpython-313.pyc b/osinaweb/osinacore/api/__pycache__/views.cpython-313.pyc
index 811e60c7..39a4d546 100644
Binary files a/osinaweb/osinacore/api/__pycache__/views.cpython-313.pyc and b/osinaweb/osinacore/api/__pycache__/views.cpython-313.pyc differ
diff --git a/osinaweb/osinacore/api/urls.py b/osinaweb/osinacore/api/urls.py
index acadd220..7598cb6c 100644
--- a/osinaweb/osinacore/api/urls.py
+++ b/osinaweb/osinacore/api/urls.py
@@ -9,5 +9,5 @@ urlpatterns = [
   path("epics/", EpicsAPIView.as_view(), name="epics"),
   path("milestones/", MileStoneAPIView.as_view(), name="milestones"),
   path("userstories/", UserStoryAPIView.as_view(), name="userstories"),
-  path("tasks/", TaskAPIView.as_view(), name="tasks"),
+  path('tasks/<int:project_id>/', TaskAPIView.as_view(), name='project-tasks'),
 ]
\ No newline at end of file
diff --git a/osinaweb/osinacore/api/views.py b/osinaweb/osinacore/api/views.py
index 30fd5bc9..ac7baad0 100644
--- a/osinaweb/osinacore/api/views.py
+++ b/osinaweb/osinacore/api/views.py
@@ -121,15 +121,13 @@ class UserStoryAPIView(APIView):
     
 
 class TaskAPIView(APIView):
-    def get(self, request):
-        data = []
-
-        tasks = Task.objects.all()
-
-        for task in tasks:
-            task_data = TaskSerializer(task).data
-
-
-            data.append(task_data)
+    def get(self, request, project_id):
+        try:
+            project = Project.objects.get(id=project_id)
+        except Project.DoesNotExist:
+            return Response({"error": "Project not found"}, status=status.HTTP_404_NOT_FOUND)
+
+        tasks = Task.objects.filter(project=project)
+        data = TaskSerializer(tasks, many=True).data
 
         return Response(data, status=status.HTTP_200_OK)
\ No newline at end of file