diff --git a/webapp/src/Entity/Clarification.php b/webapp/src/Entity/Clarification.php
index e451e39b5f9..ece9a65311e 100644
--- a/webapp/src/Entity/Clarification.php
+++ b/webapp/src/Entity/Clarification.php
@@ -267,6 +267,14 @@ public function getProblem(): ?Problem
         return $this->problem;
     }
 
+    public function getContestProblem(): ?ContestProblem
+    {
+        if (!$this->problem) {
+            return null;
+        }
+        return $this->contest->getContestProblem($this->problem);
+    }
+
     /**
      * @Serializer\VirtualProperty()
      * @Serializer\SerializedName("problem_id")
diff --git a/webapp/templates/jury/partials/clarification_list.html.twig b/webapp/templates/jury/partials/clarification_list.html.twig
index 44b22234cc5..282a0411e6e 100644
--- a/webapp/templates/jury/partials/clarification_list.html.twig
+++ b/webapp/templates/jury/partials/clarification_list.html.twig
@@ -71,7 +71,7 @@
 
             <td><a href="{{ link }}">
                     {%- if clarification.problem -%}
-                        problem {{ clarification.problem.contestProblems.first | problemBadge -}}
+                        problem {{ clarification.contestProblem | problemBadge -}}
                     {%- elseif clarification.category -%}
                         {{- categories[clarification.category]|default('general') -}}
                     {%- else -%}
diff --git a/webapp/templates/team/partials/clarification.html.twig b/webapp/templates/team/partials/clarification.html.twig
index a0d72d26cd0..3900963f761 100644
--- a/webapp/templates/team/partials/clarification.html.twig
+++ b/webapp/templates/team/partials/clarification.html.twig
@@ -4,7 +4,7 @@
             <div class="col-sm">
                 Subject:
                 {% if clarification.problem %}
-                    Problem {{ clarification.problem.contestProblems.first.shortname }}: {{ clarification.problem.name }}
+                    Problem {{ clarification.contestProblem.shortname }}: {{ clarification.problem.name }}
                 {% elseif clarification.category %}
                     {{ categories[clarification.category]|default('general') }}
                 {% else %}
diff --git a/webapp/templates/team/partials/clarification_list.html.twig b/webapp/templates/team/partials/clarification_list.html.twig
index a36c1e0f30a..47b154c5423 100644
--- a/webapp/templates/team/partials/clarification_list.html.twig
+++ b/webapp/templates/team/partials/clarification_list.html.twig
@@ -44,7 +44,7 @@
                 <td>
                     <a data-ajax-modal data-ajax-modal-after="markSeen" href="{{ link }}">
                         {%- if clarification.problem -%}
-                            problem {{ clarification.problem.contestProblems.first | problemBadge -}}
+                            problem {{ clarification.contestProblem | problemBadge -}}
                         {%- elseif clarification.category -%}
                             {{- categories[clarification.category]|default('general') -}}
                         {%- else -%}