diff --git a/modules/cms-kit/test/Volo.CmsKit.TestBase/CmsKitDataSeedContributor.cs b/modules/cms-kit/test/Volo.CmsKit.TestBase/CmsKitDataSeedContributor.cs
index e2231570b9..2237ecc064 100644
--- a/modules/cms-kit/test/Volo.CmsKit.TestBase/CmsKitDataSeedContributor.cs
+++ b/modules/cms-kit/test/Volo.CmsKit.TestBase/CmsKitDataSeedContributor.cs
@@ -41,7 +41,7 @@ namespace Volo.CmsKit
 
         public async Task SeedAsync(DataSeedContext context)
         {
-            using (_currentTenant.Change(context.TenantId))
+            using (_currentTenant.Change(context?.TenantId))
             {
                 await SeedUsersAsync();
 
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/IdentityServer/IdentityServerDataSeedContributor.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/IdentityServer/IdentityServerDataSeedContributor.cs
index fb87b48303..e447c3c505 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/IdentityServer/IdentityServerDataSeedContributor.cs
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/IdentityServer/IdentityServerDataSeedContributor.cs
@@ -49,7 +49,7 @@ namespace MyCompanyName.MyProjectName.IdentityServer
         [UnitOfWork]
         public virtual async Task SeedAsync(DataSeedContext context)
         {
-            using (_currentTenant.Change(context.TenantId))
+            using (_currentTenant.Change(context?.TenantId))
             {
                 await _identityResourceDataSeeder.CreateStandardResourcesAsync();
                 await CreateApiResourcesAsync();
diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/IdentityServer/IdentityServerDataSeedContributor.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/IdentityServer/IdentityServerDataSeedContributor.cs
index bff1f28f30..c74db4036e 100644
--- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/IdentityServer/IdentityServerDataSeedContributor.cs
+++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.IdentityServer/IdentityServer/IdentityServerDataSeedContributor.cs
@@ -46,7 +46,7 @@ namespace MyCompanyName.MyProjectName.IdentityServer
         [UnitOfWork]
         public virtual async Task SeedAsync(DataSeedContext context)
         {
-            using (_currentTenant.Change(context.TenantId))
+            using (_currentTenant.Change(context?.TenantId))
             {
                 await _identityResourceDataSeeder.CreateStandardResourcesAsync();
                 await CreateApiResourcesAsync();