diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureManagementModal.razor b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureManagementModal.razor
index 057b6533e3..6fe3972b33 100644
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureManagementModal.razor
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureManagementModal.razor
@@ -10,7 +10,7 @@
             <CloseButton Clicked="CloseModal" />
         </ModalHeader>
         <ModalBody MaxHeight="50">
-            @if (Groups == null)
+            @if (Groups == null || !Groups.Any())
             {
                 <span>@L["NoFeatureFoundMessage"]</span>
             }
diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureManagementModal.razor.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureManagementModal.razor.cs
index 12c39dd94f..e270bd8d10 100644
--- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureManagementModal.razor.cs
+++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureManagementModal.razor.cs
@@ -47,9 +47,14 @@ namespace Volo.Abp.FeatureManagement.Blazor.Components
                 ToggleValues = new Dictionary<string, bool>();
                 SelectionStringValues = new Dictionary<string, string>();
 
-                Groups = (await FeatureAppService.GetAsync(ProviderName, ProviderKey)).Groups;
+                Groups = (await FeatureAppService.GetAsync(ProviderName, ProviderKey))?.Groups;
 
-                SelectedTabName = GetNormalizedGroupName(Groups.First().Name);
+                Groups ??= new List<FeatureGroupDto>();
+
+                if (Groups.Any())
+                {
+                    SelectedTabName = GetNormalizedGroupName(Groups.First().Name);
+                }
 
                 foreach (var featureGroupDto in Groups)
                 {