From 71d4f1646600221afc751736282f3b348a1798f5 Mon Sep 17 00:00:00 2001
From: Sasha Rakhmatulin <sasha@ritsuko.dev>
Date: Thu, 26 Mar 2026 14:14:18 +0000
Subject: [PATCH] fix(plugin-multi-tenant): infinite api calling loop on user
 switch

---
 .../src/providers/TenantSelectionProvider/index.client.tsx  | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/plugin-multi-tenant/src/providers/TenantSelectionProvider/index.client.tsx b/packages/plugin-multi-tenant/src/providers/TenantSelectionProvider/index.client.tsx
index d7f4ac9e402..0fe0b67982e 100644
--- a/packages/plugin-multi-tenant/src/providers/TenantSelectionProvider/index.client.tsx
+++ b/packages/plugin-multi-tenant/src/providers/TenantSelectionProvider/index.client.tsx
@@ -251,14 +251,12 @@ export const TenantSelectionProviderClient = ({
         // user logging out
         setSelectedTenantID(undefined)
         deleteTenantCookie()
-        if (tenantOptions.length > 0) {
-          setTenantOptions([])
-        }
+        setTenantOptions((prev) => (prev.length > 0 ? [] : prev))
         router.refresh()
       }
       prevUserID.current = userID
     }
-  }, [userID, userChanged, syncTenants, tenantOptions, initialValue, router])
+  }, [userID, userChanged, syncTenants, initialValue, router])
 
   /**
    * If there is no initial value, clear the tenant and refresh the router.