diff --git a/templates/forum/forum.twig b/templates/forum/forum.twig
index 3624c6c3..57e55ad5 100644
--- a/templates/forum/forum.twig
+++ b/templates/forum/forum.twig
@@ -8,7 +8,7 @@
 }) %}
 
 {% block content %}
-    {{ forum_header(forum_info.forum_name, forum_breadcrumbs, true) }}
+    {{ forum_header(forum_info.forum_name, forum_breadcrumbs, true, canonical_url) }}
 
     {% if forum_may_have_children and forum_info.forum_subforums|length > 0 %}
         {{ forum_category_listing(forum_info.forum_subforums, 'Forums') }}
@@ -20,4 +20,6 @@
         {{ forum_topic_listing(forum_topics) }}
         {{ category_tools }}
     {% endif %}
+
+    {{ forum_header('', forum_breadcrumbs) }}
 {% endblock %}
diff --git a/templates/forum/topic.twig b/templates/forum/topic.twig
index 894096a1..6855d3f0 100644
--- a/templates/forum/topic.twig
+++ b/templates/forum/topic.twig
@@ -19,9 +19,10 @@
 {% set topic_tools = forum_topic_tools(topic_info, topic_range, topic_offset, can_reply) %}
 
 {% block content %}
-    {{ forum_header(topic_info.topic_title, topic_breadcrumbs) }}
+    {{ forum_header(topic_info.topic_title, topic_breadcrumbs, false, canonical_url) }}
     {{ forum_topic_locked(topic_info.topic_locked, topic_info.topic_archived) }}
     {{ topic_tools }}
     {{ forum_post_listing(topic_posts, current_user.user_id|default(0), topic_perms) }}
     {{ topic_tools }}
+    {{ forum_header('', topic_breadcrumbs) }}
 {% endblock %}