diff --git a/client/src/lifecycleManager.js b/client/src/lifecycleManager.js
index 46b4185124..391ca1e2f6 100644
--- a/client/src/lifecycleManager.js
+++ b/client/src/lifecycleManager.js
@@ -150,32 +150,30 @@ class LifecycleManager extends LuigiClientBase {
     let luigiCookieKey;
     const winParent = window.parent;
     const targetOrigin = winParent.origin !== 'null' ? winParent.origin : '*';
+    const luigiCookieValue = 'luigiCookie=true';
     const getLuigiCookie = storedCookies =>
       storedCookies
         .split(';')
         .map(cookie => DOMPurify.sanitize(cookie).trim())
-        .find(cookie => cookie === 'luigiCookie=true');
-    const setLuigiCookie = luigiCookie => {
-      luigiCookieKey = luigiCookie.split('=')[0];
-      document.cookie = luigiCookieKey + '=; Max-Age=-99999999; SameSite=None; Secure';
-    };
+        .find(cookie => cookie === luigiCookieValue);
 
     if (cookies) {
       luigiCookie = getLuigiCookie(cookies);
     }
-    if (luigiCookie === 'luigiCookie=true') {
-      setLuigiCookie(luigiCookie);
+    if (luigiCookie === luigiCookieValue) {
+      luigiCookieKey = luigiCookie.split('=')[0];
+      document.cookie = luigiCookieKey + '=; Max-Age=-99999999; SameSite=None; Secure';
     }
 
-    document.cookie = 'luigiCookie=true; SameSite=None; Secure';
+    document.cookie = luigiCookieValue + '; SameSite=None; Secure';
     cookies = document.cookie;
 
     if (cookies) {
       luigiCookie = getLuigiCookie(cookies);
     }
-    if (luigiCookie === 'luigiCookie=true') {
+    if (luigiCookie === luigiCookieValue) {
       winParent.postMessage({ msg: 'luigi.third-party-cookie', tpc }, targetOrigin);
-      setLuigiCookie(luigiCookie);
+      document.cookie = luigiCookieKey + '=; Max-Age=-99999999; SameSite=None; Secure';
     } else {
       tpc = 'disabled';
       winParent.postMessage({ msg: 'luigi.third-party-cookie', tpc }, targetOrigin);
diff --git a/core/third-party-cookies/init.html b/core/third-party-cookies/init.html
index 302f0a1c6e..ce00283bb8 100644
--- a/core/third-party-cookies/init.html
+++ b/core/third-party-cookies/init.html
@@ -7,32 +7,30 @@
     let luigiCookieKey;
     const winParent = window.parent;
     const targetOrigin = winParent.origin !== 'null' ? winParent.origin : '*';
+    const luigiCookieValue = 'luigiCookie=true';
     const getLuigiCookie = storedCookies =>
       storedCookies
         .split(';')
         .map(cookie => DOMPurify.sanitize(cookie).trim())
-        .find(cookie => cookie === 'luigiCookie=true');
-    const setLuigiCookie = luigiCookie => {
-      luigiCookieKey = luigiCookie.split('=')[0];
-      document.cookie = luigiCookieKey + '=; Max-Age=-99999999; SameSite=None; Secure';
-    };
+        .find(cookie => cookie === luigiCookieValue);
 
     if (cookies) {
       luigiCookie = getLuigiCookie(cookies);
     }
-    if (luigiCookie === 'luigiCookie=true') {
-      setLuigiCookie(luigiCookie);
+    if (luigiCookie === luigiCookieValue) {
+      luigiCookieKey = luigiCookie.split('=')[0];
+      document.cookie = luigiCookieKey + '=; Max-Age=-99999999; SameSite=None; Secure';
     }
 
-    document.cookie = 'luigiCookie=true; SameSite=None; Secure';
+    document.cookie = luigiCookieValue + '; SameSite=None; Secure';
     cookies = document.cookie;
 
     if (cookies) {
       luigiCookie = getLuigiCookie(cookies);
     }
-    if (luigiCookie === 'luigiCookie=true') {
+    if (luigiCookie === luigiCookieValue) {
       winParent.postMessage({ msg: 'luigi.third-party-cookie', tpc }, targetOrigin);
-      setLuigiCookie(luigiCookie);
+      document.cookie = luigiCookieKey + '=; Max-Age=-99999999; SameSite=None; Secure';
     } else {
       tpc = 'disabled';
       winParent.postMessage({ msg: 'luigi.third-party-cookie', tpc }, targetOrigin);