diff --git a/app/Models/Scopes/TenantScope.php b/app/Models/Scopes/TenantScope.php
index 68eb57e5..3877db1f 100644
--- a/app/Models/Scopes/TenantScope.php
+++ b/app/Models/Scopes/TenantScope.php
@@ -33,6 +33,7 @@ public function apply(Builder $builder, Model $model)
 
             self::$cachedTenantId = $request->attributes->get('tenant_id')
                 ?? $request->header('X-TENANT-ID')
+                ?? session('selected_tenant_id')
                 ?? auth()->user()?->tenant_id;
 
             self::$cacheInitialized = true;