diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Application/Volo/Abp/FeatureManagement/FeatureAppService.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Application/Volo/Abp/FeatureManagement/FeatureAppService.cs
index 6f0fe4815e..bfb6e65ea8 100644
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Application/Volo/Abp/FeatureManagement/FeatureAppService.cs
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Application/Volo/Abp/FeatureManagement/FeatureAppService.cs
@@ -105,11 +105,9 @@ namespace Volo.Abp.FeatureManagement
         protected virtual async Task CheckProviderPolicy(string providerName, string providerKey)
         {
             string policyName;
-            if (providerName == TenantFeatureValueProvider.ProviderName)
+            if (providerName == TenantFeatureValueProvider.ProviderName && CurrentTenant.Id == null && providerKey == null )
             {
-                policyName = CurrentTenant.Id == null && providerKey == null ?
-                    "FeatureManagement.ManageHostFeatures" :
-                    "AbpTenantManagement.Tenants.ManageFeatures";
+                policyName = "FeatureManagement.ManageHostFeatures";
             }
             else
             {
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/AbpFeatureManagementDomainModule.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/AbpFeatureManagementDomainModule.cs
index 34a0e198c7..38a2fa3c56 100644
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/AbpFeatureManagementDomainModule.cs
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Domain/Volo/Abp/FeatureManagement/AbpFeatureManagementDomainModule.cs
@@ -22,6 +22,7 @@ namespace Volo.Abp.FeatureManagement
 
                 //TODO: Should be moved to the Tenant Management module
                 options.Providers.Add<TenantFeatureManagementProvider>();
+                options.ProviderPolicies[TenantFeatureValueProvider.ProviderName] = "AbpTenantManagement.Tenants.ManageFeatures";
             });
 
             Configure<AbpExceptionLocalizationOptions>(options =>