diff --git a/grails-app/taglib/streama/AssetSettingTagLib.groovy b/grails-app/taglib/streama/AssetSettingTagLib.groovy
index bd13b3042..830be8645 100644
--- a/grails-app/taglib/streama/AssetSettingTagLib.groovy
+++ b/grails-app/taglib/streama/AssetSettingTagLib.groovy
@@ -40,4 +40,23 @@ class AssetSettingTagLib {
       out << getAssetFromSetting(setting)
       out << ');}</style>'
     }
+
+
+    def googleAnalytics = { attribs ->
+      def enabled = grailsApplication.config.streama.googleAnalytics?.enabled
+      def id = grailsApplication.config.streama.googleAnalytics?.id
+
+      if(!enabled){
+        return
+      }
+
+      out << '<!-- Global site tag (gtag.js) - Google Analytics -->'
+      out << '<script async src="https://www.googletagmanager.com/gtag/js?id='+ id +'"></script>'
+      out << '<script>'
+      out << 'window.dataLayer = window.dataLayer || [];'
+      out << 'function gtag(){dataLayer.push(arguments);}'
+      out << 'gtag(\'js\', new Date());'
+      out << 'gtag(\'config\', \'UA-124224387-2\');'
+      out << '</script>'
+    }
 }
diff --git a/grails-app/views/index.gsp b/grails-app/views/index.gsp
index 5fb16bd56..59f83947a 100644
--- a/grails-app/views/index.gsp
+++ b/grails-app/views/index.gsp
@@ -42,5 +42,7 @@
 
     <asset:javascript src="vendor.js" />
     <asset:javascript src="streama/streama.js" />
+
+    <g:googleAnalytics/>
 </body>
 </html>
diff --git a/grails-app/views/login/auth.gsp b/grails-app/views/login/auth.gsp
index ea61ec075..572c5eec4 100644
--- a/grails-app/views/login/auth.gsp
+++ b/grails-app/views/login/auth.gsp
@@ -85,5 +85,8 @@
     // -->
   </script>
 
+
+  <g:googleAnalytics/>
+
 </body>
 </html>