diff --git a/model/jpa/src/main/java/org/keycloak/organization/jpa/OrganizationAdapter.java b/model/jpa/src/main/java/org/keycloak/organization/jpa/OrganizationAdapter.java
index a664c91eca..f4b9d0e29c 100644
--- a/model/jpa/src/main/java/org/keycloak/organization/jpa/OrganizationAdapter.java
+++ b/model/jpa/src/main/java/org/keycloak/organization/jpa/OrganizationAdapter.java
@@ -23,7 +23,6 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 import java.util.Objects;
-import java.util.Set;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -36,6 +35,7 @@ import org.keycloak.models.jpa.JpaModel;
 import org.keycloak.models.jpa.entities.OrganizationDomainEntity;
 import org.keycloak.models.jpa.entities.OrganizationEntity;
 import org.keycloak.organization.OrganizationProvider;
+import org.keycloak.utils.EmailValidationUtil;
 
 import java.util.List;
 
@@ -103,7 +103,7 @@ public final class OrganizationAdapter implements OrganizationModel, JpaModel<Or
         }
 
         Map<String, OrganizationDomainModel> modelMap = domains.stream()
-                .peek(this::isDomainInUse)
+                .peek(this::validateDomainRepresentation)
                 .collect(Collectors.toMap(OrganizationDomainModel::getName, Function.identity()));
 
         for (OrganizationDomainEntity domainEntity : new HashSet<>(this.entity.getDomains())) {
@@ -153,10 +153,23 @@ public final class OrganizationAdapter implements OrganizationModel, JpaModel<Or
         return new OrganizationDomainModel(entity.getName(), entity.isVerified());
     }
 
-    private void isDomainInUse(OrganizationDomainModel domainRep) {
-        OrganizationModel orgModel = provider.getByDomainName(domainRep.getName());
+    /**
+     * Validates the domain representation. Specifically, the method first checks if the specified domain is valid,
+     * and then checks if the domain is not already linked to a different organization.
+     *
+     * @param domainModel the {@link OrganizationDomainModel} representing the domain being added.
+     * @throws {@link ModelValidationException} if the domain is invalid or is already linked to a different organization.
+     */
+    private void validateDomainRepresentation(OrganizationDomainModel domainModel) {
+        String domainName = domainModel.getName();
+
+        // we rely on the same validation util used by the EmailValidator to ensure the domain part is consistently validated.
+        if(domainName == null || domainName.isEmpty() || !EmailValidationUtil.isValidEmail("nouser@" + domainName)) {
+            throw new ModelValidationException("The specified domain is invalid: " + domainName);
+        }
+        OrganizationModel orgModel = provider.getByDomainName(domainName);
         if (orgModel != null && !Objects.equals(getId(), orgModel.getId())) {
-            throw new ModelValidationException("Domain " + domainRep.getName() + " is already linked to another organization");
+            throw new ModelValidationException("Domain " + domainName + " is already linked to another organization");
         }
     }
 
diff --git a/server-spi/src/main/java/org/keycloak/models/OrganizationDomainModel.java b/server-spi/src/main/java/org/keycloak/models/OrganizationDomainModel.java
index 494257654d..a87d9e59a0 100644
--- a/server-spi/src/main/java/org/keycloak/models/OrganizationDomainModel.java
+++ b/server-spi/src/main/java/org/keycloak/models/OrganizationDomainModel.java
@@ -43,7 +43,7 @@ public class OrganizationDomainModel implements Serializable {
     }
 
     public void setName(String name) {
-        this.name = name;
+        this.name = name != null ? name.trim() : null;
     }
 
     public boolean getVerified() {
diff --git a/services/src/main/java/org/keycloak/organization/admin/resource/OrganizationResource.java b/services/src/main/java/org/keycloak/organization/admin/resource/OrganizationResource.java
index 4caa12711a..9ce267f4a7 100644
--- a/services/src/main/java/org/keycloak/organization/admin/resource/OrganizationResource.java
+++ b/services/src/main/java/org/keycloak/organization/admin/resource/OrganizationResource.java
@@ -187,6 +187,7 @@ public class OrganizationResource {
         model.setName(rep.getName());
         model.setAttributes(rep.getAttributes());
         model.setDomains(Optional.ofNullable(rep.getDomains()).orElse(Set.of()).stream()
+                    .filter(Objects::nonNull)
                     .map(this::toModel)
                     .collect(Collectors.toSet()));
 
diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/admin/OrganizationTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/admin/OrganizationTest.java
index 94d9b2817b..1074609df6 100755
--- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/admin/OrganizationTest.java
+++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/organization/admin/OrganizationTest.java
@@ -23,7 +23,6 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 import java.util.ArrayList;
@@ -212,6 +211,13 @@ public class OrganizationTest extends AbstractOrganizationTest {
         assertEquals(expectedNewOrgBrDomain.getName(), existingNewOrgBrDomain.getName());
         assertEquals(expectedNewOrgBrDomain.isVerified(), existingNewOrgBrDomain.isVerified());
 
+        // attempt to set the internet domain to an invalid domain.
+        expectedNewOrgBrDomain.setName("_invalid.domain.3com");
+        try (Response response = organization.update(expected)) {
+            assertEquals(Status.BAD_REQUEST.getStatusCode(), response.getStatus());
+        }
+        expectedNewOrgBrDomain.setName("acme.com");
+
         // create another org and attempt to set the same internet domain during update - should not be possible.
         OrganizationRepresentation anotherOrg = createOrganization("another-org");
         anotherOrg.addDomain(expectedNewOrgDomain);