diff --git a/modules/growthCodeIdSystem.js b/modules/growthCodeIdSystem.js
index 739cea07489..fae022f1a56 100644
--- a/modules/growthCodeIdSystem.js
+++ b/modules/growthCodeIdSystem.js
@@ -11,9 +11,9 @@ import { submodule } from '../src/hook.js'
 import {getStorageManager} from '../src/storageManager.js';
 import {MODULE_TYPE_UID} from '../src/activities/modules.js';
 
-const GCID_EXPIRY = 7;
 const MODULE_NAME = 'growthCodeId';
 const GC_DATA_KEY = '_gc_data';
+const GCID_KEY = 'gcid';
 const ENDPOINT_URL = 'https://p2.gcprivacy.com/v1/pb?'
 
 export const storage = getStorageManager({ moduleType: MODULE_TYPE_UID, moduleName: MODULE_NAME });
@@ -26,14 +26,16 @@ export const storage = getStorageManager({ moduleType: MODULE_TYPE_UID, moduleNa
 export function readData(key) {
   try {
     let payload
-    if (storage.cookiesAreEnabled()) {
-      payload = tryParse(storage.getCookie(key))
+    if (storage.cookiesAreEnabled(null)) {
+      payload = tryParse(storage.getCookie(key, null))
     }
     if (storage.hasLocalStorage()) {
-      payload = tryParse(storage.getDataFromLocalStorage(key))
+      payload = tryParse(storage.getDataFromLocalStorage(key, null))
     }
-    if ((payload.expire_at !== undefined) && (payload.expire_at > (Date.now() / 1000))) {
-      return payload
+    if (payload !== undefined) {
+      if (payload.expire_at > (Date.now() / 1000)) {
+        return payload
+      }
     }
   } catch (error) {
     logError(error);
@@ -51,12 +53,8 @@ function storeData(key, value) {
     logInfo(MODULE_NAME + ': storing data: key=' + key + ' value=' + value);
 
     if (value) {
-      if (storage.hasLocalStorage()) {
-        storage.setDataInLocalStorage(key, value);
-      }
-      const expiresStr = (new Date(Date.now() + (GCID_EXPIRY * (60 * 60 * 24 * 1000)))).toUTCString();
-      if (storage.cookiesAreEnabled()) {
-        storage.setCookie(key, value, expiresStr, 'LAX');
+      if (storage.hasLocalStorage(null)) {
+        storage.setDataInLocalStorage(key, value, null);
       }
     }
   } catch (error) {
@@ -70,11 +68,15 @@ function storeData(key, value) {
  * @param {object|null}
  */
 function tryParse(data) {
+  let payload;
   try {
-    return JSON.parse(data);
+    payload = JSON.parse(data);
+    if (payload == null) {
+      return undefined
+    }
+    return payload
   } catch (err) {
-    logError(err);
-    return null;
+    return undefined;
   }
 }
 
@@ -150,6 +152,7 @@ export const growthCodeIdSubmodule = {
             // If response is a valid json and should save is true
             if (respJson) {
               storeData(GC_DATA_KEY, JSON.stringify(respJson))
+              storeData(GCID_KEY, respJson.gc_id);
               callback(respJson);
             } else {
               callback();