diff --git a/components/cookieBanner.js b/components/cookieBanner.js
index 08286ab6..fd8bec61 100644
--- a/components/cookieBanner.js
+++ b/components/cookieBanner.js
@@ -26,6 +26,7 @@ const CookieBanner = () => {
             "usage": "accepted",
             "communications": "accepted",
             "settings": "accepted",
+            "analytics_storage": "granted",
         };
 
         cookie.set("CookiePolicy", JSON.stringify(cookieStr).toString(), {
diff --git a/components/cookiemanager/index.js b/components/cookiemanager/index.js
index 10e2a717..75fd5d00 100644
--- a/components/cookiemanager/index.js
+++ b/components/cookiemanager/index.js
@@ -20,6 +20,8 @@ const CookieManagementMain = (props) => {
         Object.assign(values, {
             "essential": "accepted",
             "usage": usageState,
+            "analytics_storage":
+                usageState == "accepted" ? "granted" : "denied",
             // "communications": communicationsState,
             "settings": settingsState,
         });
diff --git a/components/tracking/index.js b/components/tracking/index.js
index 392ef305..40a0771b 100644
--- a/components/tracking/index.js
+++ b/components/tracking/index.js
@@ -1,38 +1,50 @@
 import Script from "next/script";
 import React, { Fragment } from "react";
-import { GoogleTagManager } from "@next/third-parties/google";
+import { GoogleTagManager, GoogleAnalytics } from "@next/third-parties/google";
 
-export const Tracking = ({ googleTagManagerID, nonce }) => (
-    <>
-        <Script
-            strategy="afterInteractive"
-            src={`https://www.googletagmanager.com/gtag/js?id=${googleTagManagerID}`}
-        />
-        <Script
-            id="google-analytics"
-            strategy="afterInteractive"
-            dangerouslySetInnerHTML={{
-                __html: `
+export const Tracking = ({ googleTagManagerID, nonce, cookieObj }) => {
+    return (
+        <Fragment>
+            <script
+                strategy="afterInteractive"
+                src={`https://www.googletagmanager.com/gtag/js?id=${googleTagManagerID}`}
+            />
+            <script
+                id="google-analytics"
+                strategy="afterInteractive"
+                dangerouslySetInnerHTML={{
+                    __html: `
                 window.dataLayer = window.dataLayer || [];
                 function gtag(){dataLayer.push(arguments);}
                 gtag('js', new Date());
 
                 gtag('consent', 'default', {
-                    'analytics_storage': 'denied'
+                    'analytics_storage': 'granted',
+                    'ad_storage': 'denied',
+                    'ad_user_data': 'denied',
+                    'ad_personalization': 'denied'
                 });
                 
                 gtag('config', '${googleTagManagerID}', {
                     page_path: window.location.pathname,
                 });
+                
+                gtag('consent', 'update', {'analytics_storage': '${
+                    typeof cookieObj == "string" &&
+                    JSON.parse(cookieObj).hasOwnProperty("analytics_storage")
+                        ? JSON.parse(cookieObj).analytics_storage
+                        : "denied"
+                }'});
                 `,
-            }}
-        />
+                }}
+            />
 
-        {/* <GoogleAnalytics gaId={googleTagManagerID} /> */}
+            {/* <GoogleAnalytics gaId={googleTagManagerID} /> */}
 
-        {/* <GoogleTagManager gtmId={googleTagManagerID} /> */}
-    </>
-);
+            {/* <GoogleTagManager gtmId={googleTagManagerID} /> */}
+        </Fragment>
+    );
+};
 
 export const TrackingNoScript = ({ googleTagManagerID }) => (
     <Fragment>
diff --git a/pages/_document.js b/pages/_document.js
index 285b594d..6c730f76 100644
--- a/pages/_document.js
+++ b/pages/_document.js
@@ -21,16 +21,19 @@ class MyDocument extends Document {
             useGATracking = false;
         }
 
+        const cookieObj = ctx.req.cookies.CookiePolicy || {};
+
+        console.log("useGATracking: ", useGATracking);
         setCookie(ctx, "pedw_locale", ctx.locale, {
             path: "/",
         });
 
-        return { ...initialProps, useGATracking };
+        return { ...initialProps, useGATracking, cookieObj };
     }
 
     render() {
         const googleTagManagerID = process.env.GOOGLE_TAG_MANAGER || null;
-        const { useGATracking, locale } = this.props;
+        const { useGATracking, locale, cookieObj } = this.props;
 
         const generatedNonce = nanoid();
 
@@ -51,10 +54,12 @@ class MyDocument extends Document {
                     <meta httpEquiv="Content-Security-Policy" content={csp} />
                     {useGATracking && (
                         <Tracking
-                            googleTagManagerID="G-GTWW3JT03Z"
+                            googleTagManagerID={"G-GTWW3JT03Z"}
                             nonce={generatedNonce}
+                            cookieObj={cookieObj}
                         />
                     )}
+
                     {/* <GoogleAnalytics gaId={googleTagManagerID} /> */}
                 </Head>
                 <body className="js-enabled">