diff --git a/src/vector/index.js b/src/vector/index.js
index 6a70b76719..9d5c1dd422 100644
--- a/src/vector/index.js
+++ b/src/vector/index.js
@@ -272,7 +272,7 @@ async function loadApp() {
         const isIos = /iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream;
         const isAndroid = /Android/.test(navigator.userAgent);
         if (isIos || isAndroid) {
-            if (!document.cookie.split(';').some((c) => c.startsWith('mobile_redirect_to_guide'))) {
+            if (document.cookie.indexOf("riot_mobile_redirect_to_guide=false") === -1) {
                 window.location = "mobile_guide/";
                 return;
             }
diff --git a/src/vector/mobile_guide/index.js b/src/vector/mobile_guide/index.js
index 2c4785f390..342643b47c 100644
--- a/src/vector/mobile_guide/index.js
+++ b/src/vector/mobile_guide/index.js
@@ -1,7 +1,8 @@
 import {getVectorConfig} from '../getconfig';
 
 function onBackToRiotClick() {
-    document.cookie = 'mobile_redirect_to_guide=false;path=/';
+    // Cookie should expire in 4 hours
+    document.cookie = 'riot_mobile_redirect_to_guide=false;path=/;max-age=14400';
     window.location.href = '../';
 }