diff --git a/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/MultiTenancyMiddleware.cs b/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/MultiTenancyMiddleware.cs
index 24e2b40067..0aeb97e89d 100644
--- a/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/MultiTenancyMiddleware.cs
+++ b/framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo/Abp/AspNetCore/MultiTenancy/MultiTenancyMiddleware.cs
@@ -20,7 +20,7 @@ namespace Volo.Abp.AspNetCore.MultiTenancy
 
         public async Task InvokeAsync(HttpContext context, RequestDelegate next)
         {
-            var tenant = await _tenantConfigurationProvider.GetAsync();
+            var tenant = await _tenantConfigurationProvider.GetAsync(saveResolveResult: true);
             using (_currentTenant.Change(tenant?.Id, tenant?.Name))
             {
                 await next(context);
diff --git a/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ITenantConfigurationProvider.cs b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ITenantConfigurationProvider.cs
index d46b6b2497..010a10791a 100644
--- a/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ITenantConfigurationProvider.cs
+++ b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ITenantConfigurationProvider.cs
@@ -4,6 +4,6 @@ namespace Volo.Abp.MultiTenancy
 {
     public interface ITenantConfigurationProvider
     {
-        Task<TenantConfiguration> GetAsync();
+        Task<TenantConfiguration> GetAsync(bool saveResolveResult = false);
     }
 }
diff --git a/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/TenantConfigurationProvider.cs b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/TenantConfigurationProvider.cs
index 7e32611dfb..a89c44b465 100644
--- a/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/TenantConfigurationProvider.cs
+++ b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/TenantConfigurationProvider.cs
@@ -20,10 +20,14 @@ namespace Volo.Abp.MultiTenancy
             TenantResolveResultAccessor = tenantResolveResultAccessor;
         }
 
-        public virtual async Task<TenantConfiguration> GetAsync()
+        public virtual async Task<TenantConfiguration> GetAsync(bool saveResolveResult = false)
         {
             var resolveResult = TenantResolver.ResolveTenantIdOrName();
-            TenantResolveResultAccessor.Result = resolveResult;
+
+            if (saveResolveResult)
+            {
+                TenantResolveResultAccessor.Result = resolveResult;
+            }
 
             TenantConfiguration tenant = null;
             if (resolveResult.TenantIdOrName != null)