diff --git a/pwa/src/hooks/useEnvironment.ts b/pwa/src/hooks/useEnvironment.ts
index 9713db71..47de647a 100644
--- a/pwa/src/hooks/useEnvironment.ts
+++ b/pwa/src/hooks/useEnvironment.ts
@@ -63,6 +63,8 @@ export const useEnvironment = () => {
         window.sessionStorage.setItem("SHOW_THEME_SWITCHER", "true");
         break;
     }
+
+    if (process.env.GATSBY_SHOW_THEME_SWITCHER === "true") window.sessionStorage.setItem("SHOW_THEME_SWITCHER", "true");
   };
 
   return { initiateFromEnv, initiateFromJSON };