diff --git a/webapp/src/Controller/Team/MiscController.php b/webapp/src/Controller/Team/MiscController.php
index e714d6737b..648b4bf727 100644
--- a/webapp/src/Controller/Team/MiscController.php
+++ b/webapp/src/Controller/Team/MiscController.php
@@ -95,10 +95,12 @@ public function homeAction(Request $request): Response
             $clarifications = $this->em->createQueryBuilder()
                 ->from(Clarification::class, 'c')
                 ->leftJoin('c.problem', 'p')
+                ->leftJoin('p.contest_problems', 'cp')
                 ->leftJoin('c.sender', 's')
                 ->leftJoin('c.recipient', 'r')
-                ->select('c', 'p')
+                ->select('c', 'cp', 'p')
                 ->andWhere('c.contest = :contest')
+                ->andWhere('cp.contest = :contest')
                 ->andWhere('c.sender IS NULL')
                 ->andWhere('c.recipient = :team OR c.recipient IS NULL')
                 ->setParameter('contest', $contest)
@@ -112,10 +114,12 @@ public function homeAction(Request $request): Response
             $clarificationRequests = $this->em->createQueryBuilder()
                 ->from(Clarification::class, 'c')
                 ->leftJoin('c.problem', 'p')
+                ->leftJoin('p.contest_problems', 'cp')
                 ->leftJoin('c.sender', 's')
                 ->leftJoin('c.recipient', 'r')
-                ->select('c', 'p')
+                ->select('c', 'cp', 'p')
                 ->andWhere('c.contest = :contest')
+                ->andWhere('cp.contest = :contest')
                 ->andWhere('c.sender = :team')
                 ->setParameter('contest', $contest)
                 ->setParameter('team', $team)