diff --git a/layouts/docs/list.html b/layouts/docs/list.html
index 9c231590d0..9ba3e31e80 100644
--- a/layouts/docs/list.html
+++ b/layouts/docs/list.html
@@ -11,7 +11,7 @@ <h1>{{ .Title }}</h1>
 	{{ .Content }}
   {{ partial "section-index.html" . -}}
 	{{ partial "feedback.html" . -}}
-	{{ if (.Site.DisqusShortname) -}}
+	{{ if (.Site.Config.Services.Disqus.Shortname) -}}
 		<br />
 		{{- partial "disqus-comment.html" . -}}
 	{{ end -}}
diff --git a/layouts/partials/disqus-comment.html b/layouts/partials/disqus-comment.html
index c3ae3f91b3..f7406c4848 100644
--- a/layouts/partials/disqus-comment.html
+++ b/layouts/partials/disqus-comment.html
@@ -14,7 +14,7 @@
 */
 (function() { // DON'T EDIT BELOW THIS LINE
 var d = document, s = d.createElement('script');
-s.src = 'https://' + {{ .Site.DisqusShortname }} + '.disqus.com/embed.js';
+s.src = 'https://' + {{ .Site.Config.Services.Disqus.Shortname }} + '.disqus.com/embed.js';
 s.setAttribute('data-timestamp', +new Date());
 (d.head || d.body).appendChild(s);
 })();
diff --git a/layouts/swagger/list.html b/layouts/swagger/list.html
index f5dd7d1deb..210dd2c42f 100644
--- a/layouts/swagger/list.html
+++ b/layouts/swagger/list.html
@@ -11,7 +11,7 @@ <h1>{{ .Title }}</h1>
 	{{ .Content }}
   {{ partial "section-index.html" . -}}
 	{{ partial "feedback.html" . -}}
-	{{ if (.Site.DisqusShortname) -}}
+	{{ if (.Site.Config.Services.Disqus.Shortname) -}}
 		<br />
 		{{ partial "disqus-comment.html" . -}}
 	{{ end -}}