diff --git a/api/http/handler/edgegroups/edgegroup_update.go b/api/http/handler/edgegroups/edgegroup_update.go
index 0cffc1201..4596701ee 100644
--- a/api/http/handler/edgegroups/edgegroup_update.go
+++ b/api/http/handler/edgegroups/edgegroup_update.go
@@ -32,10 +32,6 @@ func (payload *edgeGroupUpdatePayload) Validate(r *http.Request) error {
 		return errors.New("tagIDs is mandatory for a dynamic Edge group")
 	}
 
-	if !payload.Dynamic && len(payload.Endpoints) == 0 {
-		return errors.New("environments is mandatory for a static Edge group")
-	}
-
 	return nil
 }
 
diff --git a/app/edge/components/group-form/groupForm.html b/app/edge/components/group-form/groupForm.html
index dd5ff109a..6da64b7a8 100644
--- a/app/edge/components/group-form/groupForm.html
+++ b/app/edge/components/group-form/groupForm.html
@@ -86,7 +86,7 @@
       <button
         type="submit"
         class="btn btn-primary btn-sm"
-        ng-disabled="$ctrl.actionInProgress || !EdgeGroupForm.$valid || (!$ctrl.model.Dynamic && !$ctrl.model.Endpoints.length) || ($ctrl.model.Dynamic && !$ctrl.model.TagIds.length)"
+        ng-disabled="$ctrl.actionInProgress || !EdgeGroupForm.$valid"
         button-spinner="$ctrl.actionInProgress"
         data-cy="edgeGroupCreate-addGroupButton"
       >