diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 5070b3f23..8981d32d7 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -157,8 +157,8 @@ <h1>{{ .Page.Title }}</h1>
       {{ end }}
 
       <!-- Keep backward compatibility with old config.yaml -->
-      {{ if site.DisqusShortname }}
-        {{ partial "comments/disqus.html" (dict (slice "disqus" "shortName")  site.DisqusShortname) }}
+      {{ if .Site.Config.Services.Disqus.Shortname }}
+        {{ partial "comments/disqus.html" (dict (slice "disqus" "shortName")  .Site.Config.Services.Disqus.Shortname) }}
       {{ end }}
 
       </div>
diff --git a/layouts/partials/analytics.html b/layouts/partials/analytics.html
index 860bac513..35db51d14 100644
--- a/layouts/partials/analytics.html
+++ b/layouts/partials/analytics.html
@@ -56,6 +56,6 @@
 {{ end }}
 
 <!-- Keep backwards compatibility and consistency with HUGO defaults -->
-{{ if site.GoogleAnalytics }}
+{{ if .Site.Config.Services.GoogleAnalytics.ID }}
     {{ template "_internal/google_analytics.html" . }}
 {{ end }}