diff --git a/src/Controller/ActivityController.php b/src/Controller/ActivityController.php
index 9dcf489..648a6c8 100644
--- a/src/Controller/ActivityController.php
+++ b/src/Controller/ActivityController.php
@@ -5,8 +5,11 @@
 use Symfony\Component\HttpFoundation\Response;
 use App\Repository\ActivityRepository;
 use App\Repository\ActorRepository;
+use App\Repository\TaskRepository;
 use App\Entity\ActivityEntity;
 use App\Entity\ActorEntity;
+use App\Entity\TaskEntity;
+use App\Enum\StatusEnum;
 use App\Form\Activity\ActivityAddForm;
 use App\Form\Activity\ActivityDeleteForm;
 use App\Form\Activity\ActivityEditForm;
@@ -119,6 +122,8 @@
         $activityRepository = $entityManager->getRepository(ActivityEntity::class);
         /** @var ActorRepository $actorRepository */
         $actorRepository = $entityManager->getRepository(ActorEntity::class);
+        /** @var TaskRepository $taskRepository */
+        $taskRepository = $entityManager->getRepository(TaskEntity::class);
 
         // Get activity
         $activity = $activityRepository->find($id);
@@ -151,8 +156,15 @@
         // Update fields
         $activityEditForm->updateFields($activity);
 
+        // Get tasks
+        $tasks = $taskRepository->findBy([
+            'activity' => $activity,
+            'status' => StatusEnum::ACTIVE_STATUS,
+        ]);
+
         return $this->render('activity/activity.html.twig', [
             'activity' => $activity,
+            'tasks' => $tasks,
             'activityEditForm' => $activityEditForm,
         ]);
     }
diff --git a/src/Repository/ActivityRepository.php b/src/Repository/ActivityRepository.php
index c3cbd06..3235df4 100644
--- a/src/Repository/ActivityRepository.php
+++ b/src/Repository/ActivityRepository.php
@@ -23,9 +23,9 @@
     /**
      * {@inheritdoc}
      */
-    public function findAll(): array
+    public function findBy(array $criteria, ?array $orderBy = self::DEFAULT_ORDER, $limit = null, $offset = null)
     {
-        return $this->findBy([], ActivityRepository::DEFAULT_ORDER);
+        return parent::findBy($criteria, $orderBy, $limit, $offset);
     }
 
     /**
diff --git a/src/Repository/ActorRepository.php b/src/Repository/ActorRepository.php
index b096534..b462334 100644
--- a/src/Repository/ActorRepository.php
+++ b/src/Repository/ActorRepository.php
@@ -28,7 +28,15 @@
         if ($onlyActive) {
             $critera['active'] = True;
         }
-        return $this->findBy($critera, ActorRepository::DEFAULT_ORDER);
+        return $this->findBy($critera);
+    }
+    
+    /**
+     * {@inheritdoc}
+     */
+    public function findBy(array $criteria, ?array $orderBy = self::DEFAULT_ORDER, $limit = null, $offset = null)
+    {
+        return parent::findBy($criteria, $orderBy, $limit, $offset);
     }
     
     /**
diff --git a/src/Repository/TaskRepository.php b/src/Repository/TaskRepository.php
index 260040f..4f161cd 100644
--- a/src/Repository/TaskRepository.php
+++ b/src/Repository/TaskRepository.php
@@ -9,6 +9,7 @@
 
     /** @var array Default sorting */
     public const DEFAULT_ORDER = [
+        'planifiedDate' => 'asc',
         'activity' => 'desc',
         'name' => 'asc',
     ];
@@ -16,9 +17,9 @@
     /**
      * {@inheritdoc}
      */
-    public function findAll(): array
+    public function findBy(array $criteria, ?array $orderBy = self::DEFAULT_ORDER, $limit = null, $offset = null)
     {
-        return $this->findBy([], ActivityRepository::DEFAULT_ORDER);
+        return parent::findBy($criteria, $orderBy, $limit, $offset);
     }
 
     /**
diff --git a/templates/activity/activity.html.twig b/templates/activity/activity.html.twig
index d033013..cd8be82 100644
--- a/templates/activity/activity.html.twig
+++ b/templates/activity/activity.html.twig
@@ -15,4 +15,14 @@
 		</div>
 	</div>
 </div>
+<div class="col-12">
+	<div class="card">
+		<div class="card-header">
+			<h2>Tâches</h2>
+		</div>
+		<div class="card-body">
+			{% include "_includes/html/arrays/task.html.twig" with {tasks: tasks, hideActivity: true} only %}
+		</div>
+	</div>
+</div>
 {% endblock %}
\ No newline at end of file