diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index eb6e5c5..485b7d5 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -5,7 +5,7 @@
     {{ partial "header.html" . }}
     <section id="main" class="outer">
         {{ partial "article.html" . }}
-        {{ if not .Params.nocomment }}
+        {{ if and (not .Params.nocomment) .Site.Params.disqusShortname }}
             {{ template "_internal/disqus.html" . }}
         {{ end }}
     </section>
diff --git a/layouts/index.html b/layouts/index.html
index 9fb7c74..ce99b42 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -29,7 +29,7 @@
                         </div>
                     </div>
                     {{ end }}
-                    {{ if and (isset .Site.Params "disqusShortname") (ne .Site.Params.disqusShortname "") }}
+                    {{ if .Site.Params.disqusShortname }}
                     <div class="article-comment-link-wrap">
                         <a href="{{ .RelPermalink }}#ds-thread" class="article-comment-link">Comments</a>
                     </div>
diff --git a/layouts/partials/article.html b/layouts/partials/article.html
index 59556cd..dbdc261 100644
--- a/layouts/partials/article.html
+++ b/layouts/partials/article.html
@@ -23,7 +23,7 @@
                 </div>
             </div>
             {{ end }}
-            {{ if and (isset .Site.Params "disqusShortname") (ne .Site.Params.disqusShortname "") }}
+            {{ if .Site.Params.disqusShortname }}
             <div class="article-comment-link-wrap">
                 <a href="{{ .RelPermalink }}#ds-thread" class="article-comment-link">Comments</a>
             </div>