diff --git a/_includes/scripts.html b/_includes/scripts.html
index 135bbd4..e8fe142 100644
--- a/_includes/scripts.html
+++ b/_includes/scripts.html
@@ -54,4 +54,4 @@
   })();
 </script>
 {% endif %}
-{% if page.comments %}{% include disqus_comments.html %}{% endif %}
\ No newline at end of file
+{% if site.disqus_shortname %}{% if page.comments %}{% include disqus_comments.html %}{% endif %}{% endif %}
\ No newline at end of file
diff --git a/_layouts/post.html b/_layouts/post.html
index b858589..7ad6d39 100644
--- a/_layouts/post.html
+++ b/_layouts/post.html
@@ -41,7 +41,7 @@
         {% endif %}
         <span class="entry-date date published"><time datetime="{{ page.date | date_to_xmlschema }}"><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 }}"><i class="icon-pencil"></i> {{ page.modified | date: "%B %d, %Y" }}</time></span>{% endif %}
-        {% if site.disqus_shortname and page.comments %}<span class="entry-comments"><i class="icon-comment-alt"></i> <a href="#disqus_thread">Comment</a></span>{% endif %}
+        {% if site.disqus_shortname %}{% if page.comments %}<span class="entry-comments"><i class="icon-comment-alt"></i> <a href="#disqus_thread">Comment</a></span>{% endif %}{% endif %}
         <span><a href="{{ site.url }}{{ page.url }}" rel="bookmark" title="{{ page.title }}"><i class="icon-link"></i> Permalink</a></span>
         {% if page.share %}
         <span class="social-share-facebook">