diff --git a/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/CrudAppServiceBase.cs b/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/CrudAppServiceBase.cs
index 638375524c..0e2efa2dd5 100644
--- a/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/CrudAppServiceBase.cs
+++ b/framework/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/CrudAppServiceBase.cs
@@ -154,9 +154,14 @@ namespace Volo.Abp.Application.Services
         
         protected virtual void TryToSetTenantId(TEntity entity)
         {
+            if (entity is IMultiTenant tenantEntity && tenantEntity.TenantId.HasValue)
+            {
+                return;
+            }
+            
             var tenantId = CurrentTenant.Id;
 
-            if (tenantId == null)
+            if (!tenantId.HasValue)
             {
                 return;
             }