diff --git a/_includes/scripts.html b/_includes/scripts.html
index 8456963..9e6a3b7 100644
--- a/_includes/scripts.html
+++ b/_includes/scripts.html
@@ -18,4 +18,4 @@
   })();
 </script>
 {% endif %}
-{% if page.comments %}{% include disqus_comments.html %}{% endif %}
\ No newline at end of file
+{% if site.disqus_shortname and page.comments != false %}{% include disqus_comments.html %}{% endif %}
\ No newline at end of file
diff --git a/_layouts/post.html b/_layouts/post.html
index 912045c..c072917 100644
--- a/_layouts/post.html
+++ b/_layouts/post.html
@@ -25,12 +25,12 @@
         <span class="author vcard" itemprop="author" itemscope itemtype="http://schema.org/Person">By <span itemprop="name" class="fn"><a href="{{ site.url }}/about" title="About {{ site.owner.name }}" itemprop="url">{{ site.owner.name }}</a></span></span>
         <span class="entry-date date published"><time datetime="{{ page.date | date_to_xmlschema }}" itemprop="datePublished"><i class="icon-calendar-empty"></i> {{ page.date | date: "%B %d, %Y" }}</time></span>
         {% if page.modified %}<span class="entry-date date modified"><time datetime="{{ page.modified }}" itemprop="dateModified"><i class="icon-pencil"></i> {{ page.modified | date: "%B %d, %Y" }}</time></span>{% endif %}
-        {% if page.comments %}<span class="entry-comments"><i class="icon-comment-alt"></i> <a href="#disqus_thread">Comment</a></span>{% endif %}
+        {% if site.disqus_shortname and page.comments != false %}<span class="entry-comments"><i class="icon-comment-alt"></i> <a href="#disqus_thread">Comment</a></span>{% endif %}
         <span><a href="{{ site.url }}{{ page.url }}" rel="bookmark" title="{{ page.title }}"><i class="icon-link"></i> Permalink</a></span>
       </footer>
       <div class="entry-content">
         {{ content }}
-        {% if page.comments %}<div id="disqus_thread"></div><!-- /#disqus_thread -->{% endif %}
+        {% if site.disqus_shortname and page.comments != false %}<div id="disqus_thread"></div><!-- /#disqus_thread -->{% endif %}
       </div><!-- /.entry-content -->
     </div><!-- /.entry-wrapper -->
     <nav class="pagination" role="navigation">