diff --git a/client/src/App/App.jsx b/client/src/App/App.jsx
index 4f8695240..d858ce36a 100644
--- a/client/src/App/App.jsx
+++ b/client/src/App/App.jsx
@@ -47,10 +47,6 @@ export function App({bodyshop, checkUserSession, currentUser, online, setOnline}
     const [listenersAdded, setListenersAdded] = useState(false)
     const {t} = useTranslation();
 
-    // Handle The Beta Switch.
-    useEffect(() => {
-        handleBeta();
-    }, [])
 
     useEffect(() => {
         if (!navigator.onLine) {
@@ -58,7 +54,7 @@ export function App({bodyshop, checkUserSession, currentUser, online, setOnline}
         }
 
         checkUserSession();
-    }, [checkUserSession, setOnline]);
+        }, [checkUserSession, setOnline]);
 
     //const b = Grid.useBreakpoint();
     // console.log("Breakpoints:", b);
@@ -104,6 +100,8 @@ export function App({bodyshop, checkUserSession, currentUser, online, setOnline}
         return <LoadingSpinner message={t("general.labels.loggingin")}/>;
     }
 
+    handleBeta();
+
     if (!online)
         return (
             <Result
diff --git a/client/src/utils/betaHandler.js b/client/src/utils/betaHandler.js
index a5587d97a..19ec72ab2 100644
--- a/client/src/utils/betaHandler.js
+++ b/client/src/utils/betaHandler.js
@@ -24,12 +24,14 @@ export const handleBeta = () => {
 
     // Beta is enabled, but the current host name does start with beta.
     if (isBeta && !currentHostName.startsWith('beta')) {
-        window.location.href = `${window.location.protocol}//beta.${currentHostName}${window.location.pathname}${window.location.search}${window.location.hash}`;
+        const href = `${window.location.protocol}//beta.${currentHostName}${window.location.pathname}${window.location.search}${window.location.hash}`;
+        window.location.replace(href);
     }
 
     // Beta is not enabled, but the current host name does start with beta.
     else if (!isBeta && currentHostName.startsWith('beta')) {
-        window.location.href = `${window.location.protocol}//${currentHostName.replace('beta.', '')}${window.location.pathname}${window.location.search}${window.location.hash}`;
+        const href = `${window.location.protocol}//${currentHostName.replace('beta.', '')}${window.location.pathname}${window.location.search}${window.location.hash}`;
+        window.location.replace(href);
     }
 }
 export default handleBeta;
\ No newline at end of file
diff --git a/client/src/utils/handleBeta.js b/client/src/utils/handleBeta.js
index 428d4fb49..8a1fba468 100644
--- a/client/src/utils/handleBeta.js
+++ b/client/src/utils/handleBeta.js
@@ -24,12 +24,14 @@ export const handleBeta = () => {
 
     // Beta is enabled, but the current host name does start with beta.
     if (isBeta && !currentHostName.startsWith('beta')) {
-        window.location.href = `${window.location.protocol}//beta.${currentHostName}${window.location.pathname}${window.location.search}${window.location.hash}`;
+        const href= `${window.location.protocol}//beta.${currentHostName}${window.location.pathname}${window.location.search}${window.location.hash}`;
+        window.location.replace(href);
     }
 
     // Beta is not enabled, but the current host name does start with beta.
     else if (!isBeta && currentHostName.startsWith('beta')) {
-        window.location.href = `${window.location.protocol}//${currentHostName.replace('beta.', '')}${window.location.pathname}${window.location.search}${window.location.hash}`;
+        const href = `${window.location.protocol}//${currentHostName.replace('beta.', '')}${window.location.pathname}${window.location.search}${window.location.hash}`;
+        window.location.replace(href);
     }
 }
 export default handleBeta;