diff --git a/npm/ng-packs/packages/feature-management/src/lib/components/feature-management/feature-management.component.html b/npm/ng-packs/packages/feature-management/src/lib/components/feature-management/feature-management.component.html
index 2dad2dfd92..44ff3f382f 100644
--- a/npm/ng-packs/packages/feature-management/src/lib/components/feature-management/feature-management.component.html
+++ b/npm/ng-packs/packages/feature-management/src/lib/components/feature-management/feature-management.component.html
@@ -4,7 +4,7 @@
   </ng-template>
 
   <ng-template #abpBody>
-    <form *ngIf="form" (ngSubmit)="save()" [formGroup]="form">
+    <form *ngIf="form" (ngSubmit)="save()" [formGroup]="form" validateOnSubmit>
       <div
         class="row my-3"
         *ngFor="let feature of features$ | async; let i = index"
@@ -25,7 +25,7 @@
     <button #abpClose type="button" class="btn btn-secondary">
       {{ 'AbpFeatureManagement::Cancel' | abpLocalization }}
     </button>
-    <abp-button iconClass="fa fa-check" (click)="save()">
+    <abp-button iconClass="fa fa-check" [disabled]="form?.invalid || modalBusy" (click)="save()">
       {{ 'AbpFeatureManagement::Save' | abpLocalization }}
     </abp-button>
   </ng-template>
diff --git a/npm/ng-packs/packages/feature-management/src/lib/components/feature-management/feature-management.component.ts b/npm/ng-packs/packages/feature-management/src/lib/components/feature-management/feature-management.component.ts
index a25d6b41ee..3a93380d39 100644
--- a/npm/ng-packs/packages/feature-management/src/lib/components/feature-management/feature-management.component.ts
+++ b/npm/ng-packs/packages/feature-management/src/lib/components/feature-management/feature-management.component.ts
@@ -76,6 +76,8 @@ export class FeatureManagementComponent {
   }
 
   save() {
+    if (this.modalBusy) return;
+
     this.modalBusy = true;
 
     let features = this.store.selectSnapshot(FeatureManagementState.getFeatures);
diff --git a/npm/ng-packs/packages/feature-management/src/lib/states/feature-management.state.ts b/npm/ng-packs/packages/feature-management/src/lib/states/feature-management.state.ts
index a02e075bdb..34dd78b0fb 100644
--- a/npm/ng-packs/packages/feature-management/src/lib/states/feature-management.state.ts
+++ b/npm/ng-packs/packages/feature-management/src/lib/states/feature-management.state.ts
@@ -11,7 +11,7 @@ import { FeatureManagementService } from '../services/feature-management.service
 export class FeatureManagementState {
   @Selector()
   static getFeatures({ features }: FeatureManagement.State) {
-    return features;
+    return features || [];
   }
 
   constructor(private featureManagementService: FeatureManagementService) {}