diff --git a/server/public/model/custom_profile_attributes.go b/server/public/model/custom_profile_attributes.go
index bcb9ab52d2f..25136daf133 100644
--- a/server/public/model/custom_profile_attributes.go
+++ b/server/public/model/custom_profile_attributes.go
@@ -99,7 +99,7 @@ func NewCustomProfileAttributesSelectOptionFromMap(m map[string]any) CustomProfi
 
 func NewCustomProfileAttributesSelectOption(id, name, color string) CustomProfileAttributesSelectOption {
 	optionID := strings.TrimSpace(id)
-	if optionID == "" || !IsValidId(optionID) {
+	if optionID == "" {
 		optionID = NewId()
 	}
 
diff --git a/server/public/model/custom_profile_attributes_test.go b/server/public/model/custom_profile_attributes_test.go
index 9abc460b042..95b6e081973 100644
--- a/server/public/model/custom_profile_attributes_test.go
+++ b/server/public/model/custom_profile_attributes_test.go
@@ -35,16 +35,6 @@ func TestNewCustomProfileAttributeSelectOption(t *testing.T) {
 		assert.Equal(t, "#FF0000", option.Color)
 	})
 
-	t.Run("generates new ID when provided ID is invalid", func(t *testing.T) {
-		invalidID := "invalid-id-format"
-		option := NewCustomProfileAttributesSelectOption(invalidID, "Test Option", "#FF0000")
-
-		assert.NotEqual(t, invalidID, option.ID)
-		assert.True(t, IsValidId(option.ID))
-		assert.Equal(t, "Test Option", option.Name)
-		assert.Equal(t, "#FF0000", option.Color)
-	})
-
 	t.Run("trims spaces from ID", func(t *testing.T) {
 		validID := NewId()
 		option := NewCustomProfileAttributesSelectOption("  "+validID+"  ", "Test Option", "#FF0000")