diff --git a/generators/client/templates/src/main/webapp/index.html.ejs b/generators/client/templates/src/main/webapp/index.html.ejs
index 7cfdc4227dc4..693540167189 100644
--- a/generators/client/templates/src/main/webapp/index.html.ejs
+++ b/generators/client/templates/src/main/webapp/index.html.ejs
@@ -128,14 +128,13 @@
     </script>
     -->
     <%_ } _%>
-    <!-- Google Analytics: uncomment and change UA-XXXXX-X to be your site's ID.
+    <!-- Google Analytics: uncomment and change both instances of UA-XXXXX-X to be your site's ID.
+    <script async src="https://www.googletagmanager.com/gtag/js?id=UA-XXXXX-X"></script>
     <script>
-      (function(b,o,i,l,e,r){b.GoogleAnalyticsObject=l;b[l]||(b[l]=
-      function(){(b[l].q=b[l].q||[]).push(arguments)});b[l].l=+new Date;
-      e=o.createElement(i);r=o.getElementsByTagName(i)[0];
-      e.src='//www.google-analytics.com/analytics.js';
-      r.parentNode.insertBefore(e,r)}(window,document,'script','ga'));
-      ga('create','UA-XXXXX-X');ga('send','pageview');
+      window.dataLayer = window.dataLayer || [];
+      function gtag(){dataLayer.push(arguments);}
+      gtag('js', new Date());
+      gtag('config', 'UA-XXXXX-X');
     </script>-->
   </body>
 </html>