diff --git a/apps/vben5/packages/@abp/saas/src/components/tenants/TenantSelect.vue b/apps/vben5/packages/@abp/saas/src/components/tenants/TenantSelect.vue
index d1c0b6ee7..7c4986abb 100644
--- a/apps/vben5/packages/@abp/saas/src/components/tenants/TenantSelect.vue
+++ b/apps/vben5/packages/@abp/saas/src/components/tenants/TenantSelect.vue
@@ -34,6 +34,7 @@ function onSwitchClick() {
 }
 
 function onChange(tenant?: { id?: string; name?: string }) {
+  abpStore.setTenantId(tenant?.id);
   emits('change', tenant);
 }
 </script>
diff --git a/apps/vben5/packages/@abp/saas/src/components/tenants/TenantSelectModal.vue b/apps/vben5/packages/@abp/saas/src/components/tenants/TenantSelectModal.vue
index d917fb1c8..a3bf6c681 100644
--- a/apps/vben5/packages/@abp/saas/src/components/tenants/TenantSelectModal.vue
+++ b/apps/vben5/packages/@abp/saas/src/components/tenants/TenantSelectModal.vue
@@ -53,7 +53,6 @@ async function onSubmit(values: Record<string, any>) {
   modalApi.setState({ submitting: true });
   try {
     tenant.value = undefined;
-    localStorage.removeItem('__tenant');
     if (values.name) {
       const result = await findTenantByNameApi(values.name);
       if (!result.success) {
@@ -69,7 +68,6 @@ async function onSubmit(values: Record<string, any>) {
         return;
       }
       tenant.value = { id: result.tenantId, name: result.normalizedName };
-      localStorage.setItem('__tenant', result.tenantId!);
     }
     emits('change', tenant.value);
     modalApi.close();