diff --git a/api/services/account_service.py b/api/services/account_service.py
index f921566d36..18f72f9ef7 100644
--- a/api/services/account_service.py
+++ b/api/services/account_service.py
@@ -66,6 +66,7 @@ class AccountService:
                         account.current_tenant_id = tenant_account_join.tenant_id
                     else:
                         _create_tenant_for_account(account)
+                    session['workspace_id'] = account.current_tenant_id
                 else:
                     account.current_tenant_id = workspace_id
             else:
@@ -75,6 +76,7 @@ class AccountService:
                     account.current_tenant_id = tenant_account_join.tenant_id
                 else:
                     _create_tenant_for_account(account)
+                session['workspace_id'] = account.current_tenant_id
 
             current_time = datetime.utcnow()
 
@@ -286,6 +288,7 @@ class TenantService:
 
         # Set the current tenant for the account
         account.current_tenant_id = tenant_account_join.tenant_id
+        session['workspace_id'] = account.current_tenant.id
 
     @staticmethod
     def get_tenant_members(tenant: Tenant) -> List[Account]: