diff --git a/material/base.html b/material/base.html
index d2cf83013..27f643064 100644
--- a/material/base.html
+++ b/material/base.html
@@ -159,10 +159,7 @@
                 {% endblock %}
               {% endblock %}
               {% block disqus %}
-                {% if (config.extra.disqus and not page.is_homepage) or
-                      (page and page.meta and page.meta.disqus) %}
-                  {% include "partials/integrations/disqus.html" %}
-                {% endif %}
+                {% include "partials/integrations/disqus.html" %}
               {% endblock %}
             </article>
           </div>
diff --git a/material/mkdocs_theme.yml b/material/mkdocs_theme.yml
index 10d073999..2cd43ea53 100644
--- a/material/mkdocs_theme.yml
+++ b/material/mkdocs_theme.yml
@@ -21,7 +21,7 @@
 # Language for theme localization
 language: en
 
-# Text direction (can be ltr or rtl)
+# Text direction (can be ltr or rtl), default: ltr
 direction:
 
 # Feature flags for functionality that alters behavior significantly, and thus
diff --git a/material/partials/integrations/disqus.html b/material/partials/integrations/disqus.html
index 666ca08c6..967ae6343 100644
--- a/material/partials/integrations/disqus.html
+++ b/material/partials/integrations/disqus.html
@@ -2,7 +2,7 @@
 {% if page and page.meta and page.meta.disqus is string %}
   {% set disqus = page.meta.disqus %}
 {% endif %}
-{% if disqus %}
+{% if not page.is_homepage and disqus %}
   <h2 id="__comments">{{ lang.t("meta.comments") }}</h2>
   <div id="disqus_thread"></div>
   <script>
diff --git a/material/partials/toc.html b/material/partials/toc.html
index 482d67985..484d4a49d 100644
--- a/material/partials/toc.html
+++ b/material/partials/toc.html
@@ -21,7 +21,7 @@
       {% if page and page.meta and page.meta.disqus is string %}
         {% set disqus = page.meta.disqus %}
       {% endif %}
-      {% if disqus %}
+      {% if not page.is_homepage and disqus %}
         <li class="md-nav__item">
           <a href="#__comments" title="{{ lang.t('meta.comments') }}" class="md-nav__link md-nav__link--active">
             {{ lang.t("meta.comments") }}
diff --git a/src/base.html b/src/base.html
index 68a73bae8..895863f03 100644
--- a/src/base.html
+++ b/src/base.html
@@ -295,10 +295,7 @@
 
               <!-- Disqus integration -->
               {% block disqus %}
-                {% if (config.extra.disqus and not page.is_homepage) or
-                      (page and page.meta and page.meta.disqus) %}
-                  {% include "partials/integrations/disqus.html" %}
-                {% endif %}
+                {% include "partials/integrations/disqus.html" %}
               {% endblock %}
             </article>
           </div>
diff --git a/src/mkdocs_theme.yml b/src/mkdocs_theme.yml
index 10d073999..2cd43ea53 100644
--- a/src/mkdocs_theme.yml
+++ b/src/mkdocs_theme.yml
@@ -21,7 +21,7 @@
 # Language for theme localization
 language: en
 
-# Text direction (can be ltr or rtl)
+# Text direction (can be ltr or rtl), default: ltr
 direction:
 
 # Feature flags for functionality that alters behavior significantly, and thus
diff --git a/src/partials/integrations/disqus.html b/src/partials/integrations/disqus.html
index 1cdfec838..0b61be440 100644
--- a/src/partials/integrations/disqus.html
+++ b/src/partials/integrations/disqus.html
@@ -27,7 +27,7 @@
 {% endif %}
 
 <!-- Disqus integration -->
-{% if disqus %}
+{% if not page.is_homepage and disqus %}
   <h2 id="__comments">{{ lang.t("meta.comments") }}</h2>
   <div id="disqus_thread"></div>
   <script>
diff --git a/src/partials/toc.html b/src/partials/toc.html
index 7265119f3..9f7b36096 100644
--- a/src/partials/toc.html
+++ b/src/partials/toc.html
@@ -54,12 +54,14 @@
         </li>
       {% endif %}
 
-      <!-- Disqus integration -->
+      <!-- Set from config but allow override -->
       {% set disqus = config.extra.disqus %}
       {% if page and page.meta and page.meta.disqus is string %}
         {% set disqus = page.meta.disqus %}
       {% endif %}
-      {% if disqus %}
+
+      <!-- Disqus integration -->
+      {% if not page.is_homepage and disqus %}
         <li class="md-nav__item">
           <a href="#__comments" title="{{ lang.t('meta.comments') }}"
               class="md-nav__link md-nav__link--active">