diff --git a/src/lib/stores/tenants.ts b/src/lib/stores/tenants.ts
index 55bfd85..130157e 100644
--- a/src/lib/stores/tenants.ts
+++ b/src/lib/stores/tenants.ts
@@ -70,9 +70,15 @@ const createTenantsStore = () => {
 
         const body = await res.json();
         const tenants = body.tenants ?? ([] as TTenant[]);
+        const newCurrentTenantId = auth.getTenant();
 
         store.update((state) => {
-          return { ...state, tenants, isLoading: false };
+          return {
+            ...state,
+            tenants,
+            isLoading: false,
+            currentTenant: tenants.find((t: TTenant) => t.id === newCurrentTenantId) || null,
+          };
         });
       } catch (error) {
         store.update((state) => {
diff --git a/src/routes/(pages)/dashboard/settings/(components)/edit-settings-form/edit-settings-form.svelte b/src/routes/(pages)/dashboard/settings/(components)/edit-settings-form/edit-settings-form.svelte
index 455db96..75a1f30 100644
--- a/src/routes/(pages)/dashboard/settings/(components)/edit-settings-form/edit-settings-form.svelte
+++ b/src/routes/(pages)/dashboard/settings/(components)/edit-settings-form/edit-settings-form.svelte
@@ -15,6 +15,7 @@
   import { superForm } from "sveltekit-superforms";
   import { zodClient } from "sveltekit-superforms/adapters";
   import { formSchema } from "./schema";
+  import { tenants } from "$lib/stores/tenants";
 
   let { entity }: { entity: TTenantSettings } = $props();
 
@@ -55,6 +56,7 @@
       validators: zodClient(formSchema),
       onResult: async (event) => {
         if (event.result.type === "success") {
+          tenants.reload();
           toast.success(m["tenants.edit.success"]());
         } else if (event.result.type === "failure") {
           toast.error(m["tenants.edit.error"]());