diff --git a/tarteaucitron.services.js b/tarteaucitron.services.js
index ddb786a..a6f8ad0 100644
--- a/tarteaucitron.services.js
+++ b/tarteaucitron.services.js
@@ -1178,10 +1178,14 @@ tarteaucitron.services.gajs = {
     "uri": "https://support.google.com/analytics/answer/6004245",
     "needConsent": true,
     "cookies": (function () {
-        // Add _gat_gtag_UA_XXXXXXX_XX cookie to cookies array
-        var gatGtagUaCookie = '_gat_gtag_' + tarteaucitron.user.gajsUa;
-        gatGtagUaCookie = gatGtagUaCookie.replace(/-/g, '_');
-        return ['_ga', '_gat', '_gid', '__utma', '__utmb', '__utmc', '__utmt', '__utmz', gatGtagUaCookie, '_ga_' + tarteaucitron.user.gajsUa.replace(/G-/g, '')];
+        var googleIdentifier = tarteaucitron.user.gajsUa,
+        tagUaCookie = '_gat_gtag_' + googleIdentifier,
+        tagGCookie = '_ga_' + googleIdentifier;
+
+        tagUaCookie = tagUaCookie.replace(/-/g, '_');
+        tagGCookie = tagGCookie.replace(/G-/g, '');
+
+        return ['_ga', '_gat', '_gid', '__utma', '__utmb', '__utmc', '__utmt', '__utmz', tagUaCookie, tagGCookie];
     })(),
     "js": function () {
         "use strict";
@@ -1214,10 +1218,14 @@ tarteaucitron.services.analytics = {
     "uri": "https://support.google.com/analytics/answer/6004245",
     "needConsent": true,
     "cookies": (function () {
-        // Add _gat_gtag_UA_XXXXXXX_XX cookie to cookies array
-        var gatGtagUaCookie = '_gat_gtag_' + tarteaucitron.user.analyticsUa;
-        gatGtagUaCookie = gatGtagUaCookie.replace(/-/g, '_');
-        return ['_ga', '_gat', '_gid', '__utma', '__utmb', '__utmc', '__utmt', '__utmz', gatGtagUaCookie, '_ga_' + tarteaucitron.user.analyticsUa.replace(/G-/g, '')];
+        var googleIdentifier = tarteaucitron.user.analyticsUa,
+        tagUaCookie = '_gat_gtag_' + googleIdentifier,
+        tagGCookie = '_ga_' + googleIdentifier;
+
+        tagUaCookie = tagUaCookie.replace(/-/g, '_');
+        tagGCookie = tagGCookie.replace(/G-/g, '');
+
+        return ['_ga', '_gat', '_gid', '__utma', '__utmb', '__utmc', '__utmt', '__utmz', tagUaCookie, tagGCookie];
     })(),
     "js": function () {
         "use strict";
@@ -1261,10 +1269,14 @@ tarteaucitron.services.gtag = {
     "uri": "https://support.google.com/analytics/answer/6004245",
     "needConsent": true,
     "cookies": (function () {
-        // Add _gat_gtag_UA_XXXXXXX_XX cookie to cookies array
-        var gatGtagUaCookie = '_gat_gtag_' + tarteaucitron.user.gtagUa;
-        gatGtagUaCookie = gatGtagUaCookie.replace(/-/g, '_');
-        return ['_ga', '_gat', '_gid', '__utma', '__utmb', '__utmc', '__utmt', '__utmz', gatGtagUaCookie, '_ga_' + tarteaucitron.user.gtagUa.replace(/G-/g, '')];
+        var googleIdentifier = tarteaucitron.user.gtagUa,
+        tagUaCookie = '_gat_gtag_' + googleIdentifier,
+        tagGCookie = '_ga_' + googleIdentifier;
+
+        tagUaCookie = tagUaCookie.replace(/-/g, '_');
+        tagGCookie = tagGCookie.replace(/G-/g, '');
+
+        return ['_ga', '_gat', '_gid', '__utma', '__utmb', '__utmc', '__utmt', '__utmz', tagUaCookie, tagGCookie];
     })(),
     "js": function () {
         "use strict";