diff --git a/templates/article.html b/templates/article.html
index 3915e7f..88aa28d 100644
--- a/templates/article.html
+++ b/templates/article.html
@@ -18,7 +18,7 @@
            when=article.locale_date,
            category='<a href="%s/%s">%s</a>'|format(SITEURL, article.category.url, article.category)|safe) }}
 
-      {% if DISQUS_SITENAME %}
+      {% if DISQUS_SITENAME and DISQUS_COMMENT_COUNT %}
       &#8226; <a href="{{ SITEURL }}/{{ article.url }}#disqus_thread">{{ _('View Comments') }}</a>
       {% endif %}
 
diff --git a/templates/base.html b/templates/base.html
index 6cd77a8..e91e155 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -91,17 +91,15 @@
 
       {% if SITESUBTITLE %}<p>{{ SITESUBTITLE }}</p>{% endif %}
 
-      {% if (pages and not DISABLE_PAGE_LINKS) or LINKS %}
+      {% if pages or LINKS %}
       <nav>
         <ul class="list">
-          {%if not DISABLE_PAGE_LINKS %}
           {% if not PAGES_SORT_ATTRIBUTE -%}
               {% set PAGES_SORT_ATTRIBUTE = 'title' %}
           {%- endif %}
           {% for page in pages|sort(attribute=PAGES_SORT_ATTRIBUTE) %}
           <li><a href="{{ SITEURL }}/{{ page.url }}{% if not DISABLE_URL_HASH %}#{{ page.slug }}{% endif %}">{{ page.title }}</a></li>
           {% endfor %}
-          {% endif %}
 
           {% for name, link in LINKS %}
           {% if DISABLE_PAGE_BLANK_TARGET %}
diff --git a/templates/index.html b/templates/index.html
index cc6182b..39c7b6e 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -21,7 +21,7 @@
            when=article.locale_date,
            category='<a href="%s/%s">%s</a>'|format(SITEURL, article.category.url, article.category)|safe) }}
 
-      {% if DISQUS_SITENAME %}
+      {% if DISQUS_SITENAME and DISQUS_COMMENT_COUNT %}
       &#8226; <a href="{{ SITEURL }}/{{ article.url }}#disqus_thread">{{ _('View Comments') }}</a>
       {% endif %}