diff --git a/src/routes/console/+page.ts b/src/routes/console/+page.ts
index ed9ab29d9..d3738605b 100644
--- a/src/routes/console/+page.ts
+++ b/src/routes/console/+page.ts
@@ -5,7 +5,8 @@ import type { PageLoad } from './$types';
 export const load: PageLoad = async ({ parent }) => {
     const { organizations } = await parent();
     if (organizations.total) {
-        throw redirect(303, `${base}/console/organization-${organizations.teams[0].$id}`);
+        const teamId = localStorage.getItem('organization') ?? organizations.teams[0].$id;
+        throw redirect(303, `${base}/console/organization-${teamId}`);
     } else {
         throw redirect(303, `${base}/console/onboarding`);
     }
diff --git a/src/routes/console/project-[project]/+layout.ts b/src/routes/console/project-[project]/+layout.ts
index ceb51ff80..37da86a17 100644
--- a/src/routes/console/project-[project]/+layout.ts
+++ b/src/routes/console/project-[project]/+layout.ts
@@ -12,6 +12,8 @@ export const load: LayoutLoad = async ({ params, depends }) => {
 
     try {
         const project = await sdkForConsole.projects.get(params.project);
+        globalThis.localStorage.setItem('project', project.$id);
+        globalThis.localStorage.setItem('organization', project.teamId);
 
         return {
             project,