diff --git a/webapp/templates/base.html.twig b/webapp/templates/base.html.twig
index 99157b6515..3bd84efe64 100644
--- a/webapp/templates/base.html.twig
+++ b/webapp/templates/base.html.twig
@@ -13,7 +13,6 @@
     <script src="{{ asset("js/jquery.min.js") }}"></script>
     <script src="{{ asset("js/jquery.debounce.min.js") }}"></script>
     <script src="{{ asset("js/bootstrap.bundle.min.js") }}"></script>
-    {% include 'partials/mathjaxhead.html.twig' %}
 
     <script src="{{ asset("js/domjudge.js") }}"></script>
     {% for file in customAssetFiles('js') %}
diff --git a/webapp/templates/jury/clarification.html.twig b/webapp/templates/jury/clarification.html.twig
index 70e79957ed..9ad2c5a8ed 100644
--- a/webapp/templates/jury/clarification.html.twig
+++ b/webapp/templates/jury/clarification.html.twig
@@ -1,4 +1,5 @@
 {% extends "jury/base.html.twig" %}
+{% import 'macros.html.twig' as base_macros %}
 
 {% set origclar = list | first %}
 {% set claimed = not origclar.answered and origclar.from_jurymember is defined %}
@@ -7,6 +8,7 @@
 
 {% block extrahead %}
     {{ parent() }}
+    {{ base_macros.mathjax_head() }}
 {% endblock %}
 
 {% block content %}
diff --git a/webapp/templates/jury/clarification_new.html.twig b/webapp/templates/jury/clarification_new.html.twig
index 6b7f8c9006..9e342e6ead 100644
--- a/webapp/templates/jury/clarification_new.html.twig
+++ b/webapp/templates/jury/clarification_new.html.twig
@@ -1,9 +1,11 @@
 {% extends "jury/base.html.twig" %}
+{% import 'macros.html.twig' as base_macros %}
 
 {% block title %}Send clarification - {{ parent() }}{% endblock %}
 
 {% block extrahead %}
     {{ parent() }}
+    {{ base_macros.mathjax_head() }}
 {% endblock %}
 
 {% block content %}
diff --git a/webapp/templates/jury/clarifications.html.twig b/webapp/templates/jury/clarifications.html.twig
index a793d7d7d5..e9d50db4f1 100644
--- a/webapp/templates/jury/clarifications.html.twig
+++ b/webapp/templates/jury/clarifications.html.twig
@@ -1,11 +1,13 @@
 {% extends "jury/base.html.twig" %}
 {% import "jury/jury_macros.twig" as macros %}
+{% import 'macros.html.twig' as base_macros %}
 
 {% block title %}Clarifications - {{ parent() }}{% endblock %}
 
 {% block extrahead %}
     {{ parent() }}
     {{ macros.table_extrahead() }}
+    {{ base_macros.mathjax_head() }}
     <style>
         .data-table td a, .data-table td a:hover {
             display: inline;
diff --git a/webapp/templates/jury/export/layout.html.twig b/webapp/templates/jury/export/layout.html.twig
index 39d6ae36a3..b806522093 100644
--- a/webapp/templates/jury/export/layout.html.twig
+++ b/webapp/templates/jury/export/layout.html.twig
@@ -1,3 +1,4 @@
+{% import 'macros.html.twig' as macros %}
 <!DOCTYPE html>
 <html lang="en" xml:lang="en">
 <head>
@@ -108,7 +109,7 @@
             color: darkgrey;
         }
     </style>
-    {% include 'partials/mathjaxhead.html.twig' %}
+    {{ macros.mathjax_head() }}
 </head>
 <body>
 <main role="main" class="">
diff --git a/webapp/templates/macros.html.twig b/webapp/templates/macros.html.twig
new file mode 100644
index 0000000000..25dd0622ab
--- /dev/null
+++ b/webapp/templates/macros.html.twig
@@ -0,0 +1,25 @@
+{% macro mathjax_head() %}
+    <script>
+        window.MathJax = {
+            tex: {
+                inlineMath: [['$', '$']]
+            },
+            chtml: {
+                fontURL: '{{ app.request.basePath }}/mathjaxfonts',
+                scale: 1.0
+            },
+            loader: {
+                paths: {
+                    mathjax: '{{ app.request.basePath }}/mathjax',
+                    '@mathjax': '{{ app.request.basePath }}/mathjax'
+                },
+                // Optional: reinforce that @mathjax modules resolve under the same base
+                source: {
+                    '@mathjax': '[mathjax]'
+                },
+                load: ['input/tex', 'output/chtml']
+            }
+        };
+    </script>
+    <script src="{{ app.request.basePath }}/mathjax/tex-chtml.js"></script>
+{% endmacro %}
diff --git a/webapp/templates/partials/mathjaxhead.html.twig b/webapp/templates/partials/mathjaxhead.html.twig
deleted file mode 100644
index 128a3fbec0..0000000000
--- a/webapp/templates/partials/mathjaxhead.html.twig
+++ /dev/null
@@ -1,23 +0,0 @@
-<script>
-    window.MathJax = {
-        tex: {
-            inlineMath: [['$', '$']]
-        },
-        chtml: {
-            fontURL: '{{ app.request.basePath }}/mathjaxfonts',
-            scale: 1.0
-        },
-        loader: {
-            paths: {
-                mathjax: '{{ app.request.basePath }}/mathjax',
-                '@mathjax': '{{ app.request.basePath }}/mathjax'
-            },
-            // Optional: reinforce that @mathjax modules resolve under the same base
-            source: {
-                '@mathjax': '[mathjax]'
-            },
-            load: ['input/tex', 'output/chtml']
-        }
-    };
-</script>
-<script src="{{ app.request.basePath }}/mathjax/tex-chtml.js"></script>
diff --git a/webapp/templates/team/clarification.html.twig b/webapp/templates/team/clarification.html.twig
index ab79ed19be..02c221ed04 100644
--- a/webapp/templates/team/clarification.html.twig
+++ b/webapp/templates/team/clarification.html.twig
@@ -1,7 +1,13 @@
 {% extends 'team/base.html.twig' %}
+{% import 'macros.html.twig' as macros %}
 
 {% block title %}View clarification - {{ parent() }}{% endblock %}
 
+{% block extrahead %}
+    {{ parent() }}
+    {{ macros.mathjax_head() }}
+{% endblock %}
+
 {% block content %}
     <h1 class="text-center mt-4">Clarification
     {% if clarification.sender and clarification.sender.teamid == team.teamid %}Request{% endif%}</h1>
diff --git a/webapp/templates/team/clarification_add.html.twig b/webapp/templates/team/clarification_add.html.twig
index 0e77a7e476..045b384534 100644
--- a/webapp/templates/team/clarification_add.html.twig
+++ b/webapp/templates/team/clarification_add.html.twig
@@ -1,7 +1,13 @@
 {% extends 'team/base.html.twig' %}
+{% import 'macros.html.twig' as macros %}
 
 {% block title %}Send clarification request - {{ parent() }}{% endblock %}
 
+{% block extrahead %}
+    {{ parent() }}
+    {{ macros.mathjax_head() }}
+{% endblock %}
+
 {% block content %}
     <div class="mt-3 container">
         <div class="card card-body clarificationform">
diff --git a/webapp/templates/team/clarifications_by_problem.html.twig b/webapp/templates/team/clarifications_by_problem.html.twig
index 2a81b1330d..4aa9e29bc5 100644
--- a/webapp/templates/team/clarifications_by_problem.html.twig
+++ b/webapp/templates/team/clarifications_by_problem.html.twig
@@ -1,7 +1,13 @@
 {% extends 'team/base.html.twig' %}
+{% import 'macros.html.twig' as macros %}
 
 {% block title %}View clarifications for problem {{ problem.name }}{% endblock %}
 
+{% block extrahead %}
+    {{ parent() }}
+    {{ macros.mathjax_head() }}
+{% endblock %}
+
 {% block extrahead %}
     {{ parent() }}
     <style>
diff --git a/webapp/templates/team/index.html.twig b/webapp/templates/team/index.html.twig
index cc5e8d3a66..2fd9ef69fc 100644
--- a/webapp/templates/team/index.html.twig
+++ b/webapp/templates/team/index.html.twig
@@ -1,9 +1,11 @@
 {% extends 'team/base.html.twig' %}
+{% import 'macros.html.twig' as macros %}
 
 {% block title %}{{ team.effectiveName }} - {{ parent() }}{% endblock %}
 
 {% block extrahead %}
     {{ parent() }}
+    {{ macros.mathjax_head() }}
     <style>
         .data-table td a, .data-table td a:hover {
             display: block;
