diff --git a/src/routes/console/project-[project]/overview/+layout.svelte b/src/routes/console/project-[project]/overview/+layout.svelte
index 4c778540e..ada304e4d 100644
--- a/src/routes/console/project-[project]/overview/+layout.svelte
+++ b/src/routes/console/project-[project]/overview/+layout.svelte
@@ -22,7 +22,7 @@
     import type { Models } from '@aw-labs/appwrite-console';
     import { Container, type UsagePeriods } from '$lib/layout';
     import { page } from '$app/stores';
-    import { project } from '../store';
+    import { onboarding, project } from '../store';
     import { usage } from './store';
     import { onMount } from 'svelte';
     import { afterNavigate } from '$app/navigation';
@@ -61,7 +61,7 @@
 
 {#if $project}
     <Container overlapCover>
-        {#if $project.keys.length === 0 && $project.platforms.length === 0}
+        {#if $onboarding}
             <Onboard {projectId} />
         {:else}
             {#if $usage}
diff --git a/src/routes/console/project-[project]/overview/keys/wizard.svelte b/src/routes/console/project-[project]/overview/keys/wizard.svelte
index e1efc9ebb..9217ccd88 100644
--- a/src/routes/console/project-[project]/overview/keys/wizard.svelte
+++ b/src/routes/console/project-[project]/overview/keys/wizard.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
     import { Wizard } from '$lib/layout';
-    import { beforeNavigate, goto } from '$app/navigation';
+    import { beforeNavigate, goto, invalidate } from '$app/navigation';
     import { wizard } from '$lib/stores/wizard';
     import type { WizardStepsType } from '$lib/layout/wizard.svelte';
     import Step1 from './wizard/step1.svelte';
@@ -10,6 +10,8 @@
     import { page } from '$app/stores';
     import { addNotification } from '$lib/stores/notifications';
     import { onDestroy } from 'svelte';
+    import { onboarding } from '../../store';
+    import { Dependencies } from '$lib/constants';
 
     async function onFinish() {
         try {
@@ -19,6 +21,9 @@
                 $key.scopes,
                 $key.expire ?? undefined
             );
+            if ($onboarding) {
+                invalidate(Dependencies.PROJECT);
+            }
             goto(`/console/project-${$page.params.project}/overview/keys/${$id}`);
         } catch (error) {
             addNotification({
diff --git a/src/routes/console/project-[project]/overview/platforms/createAndroid.svelte b/src/routes/console/project-[project]/overview/platforms/createAndroid.svelte
index 76391026c..374149153 100644
--- a/src/routes/console/project-[project]/overview/platforms/createAndroid.svelte
+++ b/src/routes/console/project-[project]/overview/platforms/createAndroid.svelte
@@ -9,8 +9,12 @@
     import Step3 from './wizard/android/step3.svelte';
     import Step4 from './wizard/step4.svelte';
     import { Dependencies } from '$lib/constants';
+    import { onboarding } from '../../store';
 
     async function onFinish() {
+        if ($onboarding) {
+            invalidate(Dependencies.PROJECT);
+        }
         invalidate(Dependencies.PLATFORMS);
         createPlatform.reset();
         wizard.hide();
diff --git a/src/routes/console/project-[project]/overview/platforms/createApple.svelte b/src/routes/console/project-[project]/overview/platforms/createApple.svelte
index e38ff1eeb..52d6b5208 100644
--- a/src/routes/console/project-[project]/overview/platforms/createApple.svelte
+++ b/src/routes/console/project-[project]/overview/platforms/createApple.svelte
@@ -9,8 +9,12 @@
     import Step3 from './wizard/apple/step3.svelte';
     import Step4 from './wizard/step4.svelte';
     import { Dependencies } from '$lib/constants';
+    import { onboarding } from '../../store';
 
     async function onFinish() {
+        if ($onboarding) {
+            invalidate(Dependencies.PROJECT);
+        }
         invalidate(Dependencies.PLATFORMS);
         createPlatform.reset();
         wizard.hide();
diff --git a/src/routes/console/project-[project]/overview/platforms/createFlutter.svelte b/src/routes/console/project-[project]/overview/platforms/createFlutter.svelte
index e9a3c6e07..8e9d5a152 100644
--- a/src/routes/console/project-[project]/overview/platforms/createFlutter.svelte
+++ b/src/routes/console/project-[project]/overview/platforms/createFlutter.svelte
@@ -9,8 +9,12 @@
     import Step3 from './wizard/flutter/step3.svelte';
     import Step4 from './wizard/step4.svelte';
     import { Dependencies } from '$lib/constants';
+    import { onboarding } from '../../store';
 
     async function onFinish() {
+        if ($onboarding) {
+            invalidate(Dependencies.PROJECT);
+        }
         invalidate(Dependencies.PLATFORMS);
         createPlatform.reset();
         wizard.hide();
diff --git a/src/routes/console/project-[project]/overview/platforms/createWeb.svelte b/src/routes/console/project-[project]/overview/platforms/createWeb.svelte
index 60fc55a99..57eb2b89c 100644
--- a/src/routes/console/project-[project]/overview/platforms/createWeb.svelte
+++ b/src/routes/console/project-[project]/overview/platforms/createWeb.svelte
@@ -9,8 +9,12 @@
     import Step3 from './wizard/web/step3.svelte';
     import Step4 from './wizard/step4.svelte';
     import { Dependencies } from '$lib/constants';
+    import { onboarding } from '../../store';
 
     async function onFinish() {
+        if ($onboarding) {
+            invalidate(Dependencies.PROJECT);
+        }
         invalidate(Dependencies.PLATFORMS);
         createPlatform.reset();
         wizard.hide();
diff --git a/src/routes/console/project-[project]/store.ts b/src/routes/console/project-[project]/store.ts
index 97c2372ec..5443d45b6 100644
--- a/src/routes/console/project-[project]/store.ts
+++ b/src/routes/console/project-[project]/store.ts
@@ -4,6 +4,10 @@ import type { Models } from '@aw-labs/appwrite-console';
 import type { BarSeriesOption } from 'echarts/charts';
 
 export const project = derived(page, ($page) => $page.data.project as Models.Project);
+export const onboarding = derived(
+    project,
+    ($project) => $project.platforms.length === 0 && $project.keys.length === 0
+);
 
 function createStats() {
     const { subscribe, set, update } = writable<Map<string, BarSeriesOption['data']>>(new Map());