diff --git a/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Services/DomainService.cs b/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Services/DomainService.cs
index a74445e4f5..ea94690d61 100644
--- a/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Services/DomainService.cs
+++ b/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Services/DomainService.cs
@@ -2,6 +2,7 @@ using System;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
 using Volo.Abp.Guids;
+using Volo.Abp.MultiTenancy;
 using Volo.Abp.Timing;
 
 namespace Volo.Abp.Domain.Services
@@ -13,6 +14,8 @@ namespace Volo.Abp.Domain.Services
         public IGuidGenerator GuidGenerator { get; set; }
 
         public ILoggerFactory LoggerFactory { get; set; }
+        
+        public ICurrentTenant CurrentTenant { get; set; }
 
         protected ILogger Logger => _lazyLogger.Value;
         private Lazy<ILogger> _lazyLogger => new Lazy<ILogger>(() => LoggerFactory?.CreateLogger(GetType().FullName) ?? NullLogger.Instance, true);
diff --git a/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/MultiTenantConnectionStringResolver.cs b/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/MultiTenantConnectionStringResolver.cs
index aad2150b8a..af5674a9b4 100644
--- a/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/MultiTenantConnectionStringResolver.cs
+++ b/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/MultiTenantConnectionStringResolver.cs
@@ -40,12 +40,7 @@ namespace Volo.Abp.MultiTenancy
 
                 var tenant = AsyncHelper.RunSync(() => tenantStore.FindAsync(_currentTenant.Id.Value)); //TODO: Can we avoid from RunSync?
 
-                if (tenant == null)
-                {
-                    return base.Resolve(connectionStringName);
-                }
-
-                if (tenant.ConnectionStrings == null)
+                if (tenant?.ConnectionStrings == null)
                 {
                     return base.Resolve(connectionStringName);
                 }