diff --git a/packages/nc-gui/components/account/ResetPassword.vue b/packages/nc-gui/components/account/ResetPassword.vue
index 455450d98a..13a347fe6a 100644
--- a/packages/nc-gui/components/account/ResetPassword.vue
+++ b/packages/nc-gui/components/account/ResetPassword.vue
@@ -46,9 +46,9 @@ const passwordChange = async () => {
 
   message.success(t('msg.success.passwordChanged'))
 
-  await signOut()
-
-  await navigateTo('/signin')
+  await signOut({
+    redirectToSignin: true,
+  })
 }
 
 const resetError = () => {
diff --git a/packages/nc-gui/components/account/Setup.vue b/packages/nc-gui/components/account/Setup.vue
index 02682338d2..07c8c5710b 100644
--- a/packages/nc-gui/components/account/Setup.vue
+++ b/packages/nc-gui/components/account/Setup.vue
@@ -73,6 +73,7 @@ onMounted(async () => {
       <div class="flex flex-col gap-6 w-150">
         <div
           v-for="config of configs"
+          :key="config.key"
           class="flex flex-col border-1 rounded-2xl border-gray-200 p-6 gap-2 hover:(shadow bg-gray-10)"
           :class="{
             'cursor-pointer': config.itemClick,
diff --git a/packages/nc-gui/components/dashboard/Sidebar/UserInfo.vue b/packages/nc-gui/components/dashboard/Sidebar/UserInfo.vue
index 041b2d8155..b910689230 100644
--- a/packages/nc-gui/components/dashboard/Sidebar/UserInfo.vue
+++ b/packages/nc-gui/components/dashboard/Sidebar/UserInfo.vue
@@ -22,12 +22,10 @@ const logout = async () => {
   try {
     const isSsoUser = !!(user?.value as any)?.sso_client_id
 
-    await signOut(false)
-
-    // No need as all stores are cleared on signout
-    // await clearWorkspaces()
-
-    await navigateTo(isSsoUser ? '/sso' : '/signin')
+    await signOut({
+      redirectToSignin: true,
+      signinUrl: isSsoUser ? '/sso' : '/signin',
+    })
   } catch (e) {
     console.error(e)
   } finally {
diff --git a/packages/nc-gui/components/general/MiniSidebar.vue b/packages/nc-gui/components/general/MiniSidebar.vue
index 56c6a08e53..1b5ea3839d 100644
--- a/packages/nc-gui/components/general/MiniSidebar.vue
+++ b/packages/nc-gui/components/general/MiniSidebar.vue
@@ -10,8 +10,9 @@ const route = useRoute()
 const email = computed(() => user.value?.email ?? '---')
 
 const logout = async () => {
-  await signOut(false)
-  await navigateTo('/signin')
+  await signOut({
+    redirectToSignin: true,
+  })
 }
 </script>
 
diff --git a/packages/nc-gui/composables/useApi/interceptors.ts b/packages/nc-gui/composables/useApi/interceptors.ts
index 3d4fb3cd40..29d9208bbb 100644
--- a/packages/nc-gui/composables/useApi/interceptors.ts
+++ b/packages/nc-gui/composables/useApi/interceptors.ts
@@ -124,9 +124,9 @@ export function addAxiosInterceptors(api: Api<any>) {
           })
         })
         .catch(async (refreshTokenError) => {
-          await state.signOut()
-
-          if (!route.value.meta.public) navigateTo('/signIn')
+          await state.signOut({
+            redirectToSignin: !route.value.meta.public,
+          })
 
           // reject the refresh token promise and reset
           refreshTokenPromiseRej(refreshTokenError)
diff --git a/packages/nc-gui/composables/useGlobal/actions.ts b/packages/nc-gui/composables/useGlobal/actions.ts
index c80618e337..94f5363573 100644
--- a/packages/nc-gui/composables/useGlobal/actions.ts
+++ b/packages/nc-gui/composables/useGlobal/actions.ts
@@ -1,5 +1,5 @@
 import { getActivePinia } from 'pinia'
-import type { Actions, AppInfo, State } from './types'
+import type { Actions, AppInfo, SignOutParams, State } from './types'
 import type { NcProjectType } from '#imports'
 
 export function useGlobalActions(state: State): Actions {
@@ -8,15 +8,20 @@ export function useGlobalActions(state: State): Actions {
   }
 
   /** Sign out by deleting the token from localStorage */
-  const signOut: Actions['signOut'] = async (_skipRedirect = false) => {
+  const signOut: Actions['signOut'] = async ({ redirectToSignin, signinUrl = '/signin' }: SignOutParams = {}) => {
     try {
       const nuxtApp = useNuxtApp()
       await nuxtApp.$api.auth.signout()
     } catch {
+      // ignore error
     } finally {
       state.token.value = null
       state.user.value = null
 
+      if (redirectToSignin) {
+        await navigateTo(signinUrl)
+      }
+
       // clear all stores data on logout
       const pn = getActivePinia()
       if (pn) {
diff --git a/packages/nc-gui/composables/useGlobal/types.ts b/packages/nc-gui/composables/useGlobal/types.ts
index e07cbdf772..4e5d412d18 100644
--- a/packages/nc-gui/composables/useGlobal/types.ts
+++ b/packages/nc-gui/composables/useGlobal/types.ts
@@ -80,9 +80,15 @@ export interface Getters {
   isLoading: WritableComputedRef<boolean>
 }
 
+export interface SignOutParams {
+  redirectToSignin?: boolean
+  signinUrl?: string
+  skipRedirect?: boolean
+}
+
 export interface Actions {
-  signOut: (skipRedirect?: boolean) => void
-  signIn: (token: string, keepProps?: boolean) => void
+  signOut: (signOutParams?: SignOutParams) => Promise<void>
+  signIn: (token: string, keepProps?: boolean) => Promise<void>
   refreshToken: () => void
   loadAppInfo: () => void
   setIsMobileMode: (isMobileMode: boolean) => void
diff --git a/packages/nc-gui/layouts/base.vue b/packages/nc-gui/layouts/base.vue
index ae590c457f..64345f0d3a 100644
--- a/packages/nc-gui/layouts/base.vue
+++ b/packages/nc-gui/layouts/base.vue
@@ -12,8 +12,9 @@ const hasSider = ref(false)
 const sidebar = ref<HTMLDivElement>()
 
 const logout = async () => {
-  await signOut(false)
-  await navigateTo('/signin')
+  await signOut({
+    redirectToSignin: true,
+  })
 }
 
 const { hooks } = useNuxtApp()
diff --git a/packages/nc-gui/layouts/new.vue b/packages/nc-gui/layouts/new.vue
index f70ddaeb50..1281ff61bc 100644
--- a/packages/nc-gui/layouts/new.vue
+++ b/packages/nc-gui/layouts/new.vue
@@ -33,8 +33,9 @@ watch(hasSidebar, (val) => {
 })
 
 const logout = async () => {
-  await signOut(false)
-  await navigateTo('/signin')
+  await signOut({
+    redirectToSignin: true,
+  })
   await clearWorkspaces()
 }
 </script>
diff --git a/packages/nc-gui/middleware/02.auth.global.ts b/packages/nc-gui/middleware/02.auth.global.ts
index 9d180bc354..550a6a8993 100644
--- a/packages/nc-gui/middleware/02.auth.global.ts
+++ b/packages/nc-gui/middleware/02.auth.global.ts
@@ -88,8 +88,7 @@ export default defineNuxtRouteMiddleware(async (to, from) => {
     }
   } else if (to.meta.requiresAuth === false && state.signedIn.value) {
     if (to.query?.logout) {
-      await state.signOut(true)
-      return navigateTo('/signin')
+      await state.signOut({ redirectToSignin: true })
     }
 
     /**
diff --git a/packages/nc-gui/pages/account/index.vue b/packages/nc-gui/pages/account/index.vue
index 9739324911..1c3b1e289d 100644
--- a/packages/nc-gui/pages/account/index.vue
+++ b/packages/nc-gui/pages/account/index.vue
@@ -20,8 +20,9 @@ const selectedKeys = computed(() => [
 const openKeys = ref([/^\/account\/users/.test($route.fullPath) && 'users'])
 
 const logout = async () => {
-  await signOut(false)
-  navigateTo('/signin')
+  await signOut({
+    redirectToSignin: true,
+  })
 }
 
 const isSetupPageAllowed = computed(() => isUIAllowed('superAdminSetup') && !isEeUI)