diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 21c1142..1618eb3 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -49,10 +49,11 @@
 			{{- end }}
   		</div>
 
-        <div id="comments" class="thin">
-            {{- if .Site.DisqusShortname }}
+
+        {{- if .Site.DisqusShortname }}
+            <div id="comments" class="thin">
                 {{ template "_internal/disqus.html" . }}
-            {{- end }}
-		</div>
+            </div>
+        {{- end }}
     </main>
 {{ end }}
diff --git a/layouts/posts/single.html b/layouts/posts/single.html
index 76152cb..19e25f9 100644
--- a/layouts/posts/single.html
+++ b/layouts/posts/single.html
@@ -87,10 +87,10 @@
             </div>
         {{ end }}
 
-        {{ if .Params.comments }}
-          <div id="comments" class="thin">
-                {{- partial "comments.html" . -}}
+        {{- if .Site.DisqusShortname }}
+            <div id="comments" class="thin">
+                {{ template "_internal/disqus.html" . }}
             </div>
-        {{ end }}
+        {{- end }}
     </main>
 {{ end }}