diff --git a/requirements.txt b/requirements.txt
index f529e15838b..0dbbf7c51be 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,7 +5,7 @@ canonicalwebteam.blog==6.4.0
 canonicalwebteam.search==1.0.0
 canonicalwebteam.templatefinder==1.0.0
 canonicalwebteam.image-template==1.3.1
-canonicalwebteam.discourse==4.0.5
+git+git://github.com/carkod/canonicalwebteam.discourse@fix-tutorials-keyerrors#egg=canonicalwebteam.discourse
 python-dateutil==2.8.1
 pytz==2020.5
 maxminddb-geolite2==2018.703
diff --git a/templates/tutorials/index.html b/templates/tutorials/index.html
index 31d2072e2a2..cca3c331f5a 100644
--- a/templates/tutorials/index.html
+++ b/templates/tutorials/index.html
@@ -90,6 +90,14 @@ <h3>Still no luck?</h3>
 {% else %}
 
 <section class="p-strip has-shadow">
+  <!-- Tutorials errors -->
+  {% if errors|length > 0 %}
+  <div class="row u-equal-height">
+    {% for error in errors %}
+      <p>{{ error }}</p>
+    {% endfor %}
+  </div>
+  {% endif %}
   <div class="row u-equal-height">
     {% if query %}
     <h4 class="col-12">
diff --git a/webapp/app.py b/webapp/app.py
index 02f09bafb1d..13ab9aae2aa 100644
--- a/webapp/app.py
+++ b/webapp/app.py
@@ -641,7 +641,7 @@ def takeovers_index():
 tutorials_docs = Tutorials(
     parser=TutorialParser(
         api=discourse_api,
-        index_topic_id=13611,
+        index_topic_id=25546,
         url_prefix=tutorials_path,
     ),
     document_template="/tutorials/tutorial.html",
diff --git a/webapp/views.py b/webapp/views.py
index 22a153c3d78..5f64358db01 100644
--- a/webapp/views.py
+++ b/webapp/views.py
@@ -356,6 +356,7 @@ def tutorials_index():
             posts_per_page=posts_per_page,
             total_results=total_results,
             total_pages=total_pages,
+            errors=tutorials_docs.parser.errors,
         )
 
     return tutorials_index