diff --git a/changelog.md b/changelog.md
index da6f050..6c65245 100644
--- a/changelog.md
+++ b/changelog.md
@@ -75,8 +75,9 @@
 
 
 ### Next
-#### Update
+#### Improve
 - Page layout
+- Show only active followed task on home page
 
 #### Fix
 - Card
diff --git a/src/Controller/MainController.php b/src/Controller/MainController.php
index 9c4a944..3a1f9e6 100644
--- a/src/Controller/MainController.php
+++ b/src/Controller/MainController.php
@@ -3,7 +3,6 @@
 
 use App\Entity\ActivityEntity;
 use App\Entity\TaskEntity;
-use App\Enum\StatusEnum;
 use App\Repository\ActivityRepository;
 use App\Repository\TaskRepository;
 use Symfony\Component\HttpFoundation\Response;
@@ -32,9 +31,7 @@
         $activities = $activityRepository->findActiveFollowed();
 
         // Get tasks
-        $tasks = $taskRepository->findBy([
-            'status' => StatusEnum::ACTIVE_STATUS,
-        ]);
+        $tasks = $taskRepository->findActiveFollowed();
 
         return $this->render('home.html.twig', [
             'activities' => $activities,
diff --git a/src/Repository/TaskRepository.php b/src/Repository/TaskRepository.php
index e5a3149..2dd7af0 100644
--- a/src/Repository/TaskRepository.php
+++ b/src/Repository/TaskRepository.php
@@ -1,9 +1,14 @@
 <?php
 namespace App\Repository;
 
+use App\Entity\ActorEntity;
 use App\Entity\TaskEntity;
+use App\Enum\StatusEnum;
+use Doctrine\Common\Collections\Criteria;
 use Doctrine\ORM\EntityRepository;
+use Doctrine\ORM\Query;
 use Doctrine\ORM\QueryBuilder;
+use Doctrine\ORM\Query\Expr\Join;
 
 class TaskRepository extends EntityRepository
 {
@@ -43,4 +48,20 @@
 
         return $queryBuilder;
     }
+    
+    public function findActiveFollowed(): array
+    {
+        // Create criteria
+        $criteria = new Criteria();
+        $criteria->andWhere($criteria->expr()
+            ->eq('actor.followed', true));
+        $criteria->andWhere($criteria->expr()
+            ->in('task.status', StatusEnum::ACTIVE_STATUS));
+        
+        $query = $this->createQueryBuilder('task');
+        $query->join(ActorEntity::class, 'actor', Join::WITH, 'task.actor = actor');
+        $query->addCriteria($criteria);
+        
+        return $query->getQuery()->execute([], Query::HYDRATE_OBJECT);
+    }
 }
\ No newline at end of file