diff --git a/themes/gohugoioTheme/layouts/_default/baseof.html b/themes/gohugoioTheme/layouts/_default/baseof.html
index b7ad4f10e..3a0a9f7f2 100755
--- a/themes/gohugoioTheme/layouts/_default/baseof.html
+++ b/themes/gohugoioTheme/layouts/_default/baseof.html
@@ -34,7 +34,7 @@
       {{- template "_internal/twitter_cards.html" . -}}
 
       {{ if eq (getenv "HUGO_ENV") "production" | or (eq .Site.Params.env "production")  }}
-        {{ template "_internal/google_analytics_async.html" . }}
+        {{ partial "gtag" . }}
       {{ end }}
 
 
diff --git a/themes/gohugoioTheme/layouts/partials/gtag.html b/themes/gohugoioTheme/layouts/partials/gtag.html
new file mode 100644
index 000000000..3e56e156d
--- /dev/null
+++ b/themes/gohugoioTheme/layouts/partials/gtag.html
@@ -0,0 +1,10 @@
+{{ with .Site.GoogleAnalytics }}
+<script async src="https://www.googletagmanager.com/gtag/js?id={{ . }}"></script>
+<script>
+  window.dataLayer = window.dataLayer || [];
+  function gtag(){dataLayer.push(arguments);}
+  gtag('js', new Date());
+
+  gtag('config', '{{ . }}');
+</script>
+{{ end }}
\ No newline at end of file