diff --git a/templates/_turbo_control.html.twig b/templates/_turbo_control.html.twig
index 252e644d..4c178038 100644
--- a/templates/_turbo_control.html.twig
+++ b/templates/_turbo_control.html.twig
@@ -18,7 +18,8 @@
{# Insert info about when the sidebar trees were updated last time, so the sidebar_tree_controller can decide if it needs to reload the tree #}
-
+{# The title block is already escaped, therefore we dont require any additional escaping here #}
+
{% for locale in locale_menu %}
diff --git a/templates/base.html.twig b/templates/base.html.twig
index 7914a9a7..0204596d 100644
--- a/templates/base.html.twig
+++ b/templates/base.html.twig
@@ -26,8 +26,9 @@
- {% apply trim %}{% block title %}{{ partdb_title}}{% endblock %}{% endapply %}
- {% set current_page_title = block("title") %}
+ {# The content block is already escaped. so we must not escape it again. #}
+ {% apply trim|raw %}{% block title %}{{ partdb_title }}{% endblock %}{% endapply %}
+ {% set current_page_title = block("title")|raw %}
{% block stylesheets %}
{# Include the main bootstrap theme based on user/global setting #}