diff --git a/internal/command/org_features.go b/internal/command/org_features.go
index 9384334b78..b1c6cdb8af 100644
--- a/internal/command/org_features.go
+++ b/internal/command/org_features.go
@@ -33,6 +33,7 @@ func (c *Commands) SetOrgFeatures(ctx context.Context, resourceOwner string, fea
 		features.LoginPolicyUsernameLogin,
 		features.PasswordComplexityPolicy,
 		features.LabelPolicy,
+		features.CustomDomain,
 	)
 	if !hasChanged {
 		return nil, caos_errs.ThrowPreconditionFailed(nil, "Features-GE4h2", "Errors.Features.NotChanged")
diff --git a/internal/command/org_features_model.go b/internal/command/org_features_model.go
index 037d4dd2cf..014d36234f 100644
--- a/internal/command/org_features_model.go
+++ b/internal/command/org_features_model.go
@@ -68,7 +68,8 @@ func (wm *OrgFeaturesWriteModel) NewSetEvent(
 	loginPolicyRegistration,
 	loginPolicyUsernameLogin,
 	passwordComplexityPolicy,
-	labelPolicy bool,
+	labelPolicy,
+	customDomain bool,
 ) (*org.FeaturesSetEvent, bool) {
 
 	changes := make([]features.FeaturesChanges, 0)
@@ -109,6 +110,9 @@ func (wm *OrgFeaturesWriteModel) NewSetEvent(
 	if wm.LabelPolicy != labelPolicy {
 		changes = append(changes, features.ChangeLabelPolicy(labelPolicy))
 	}
+	if wm.CustomDomain != customDomain {
+		changes = append(changes, features.ChangeCustomDomain(customDomain))
+	}
 
 	if len(changes) == 0 {
 		return nil, false