diff --git a/model/jpa/src/main/java/org/keycloak/authorization/jpa/entities/ResourceEntity.java b/model/jpa/src/main/java/org/keycloak/authorization/jpa/entities/ResourceEntity.java
index 612bd84d8f..68ccdc62b7 100644
--- a/model/jpa/src/main/java/org/keycloak/authorization/jpa/entities/ResourceEntity.java
+++ b/model/jpa/src/main/java/org/keycloak/authorization/jpa/entities/ResourceEntity.java
@@ -145,16 +145,7 @@ public class ResourceEntity {
     }
 
     public void setUris(Set<String> uris) {
-        // Workaround to avoid a problem in Hibernate 6.2.CR3: https://hibernate.atlassian.net/browse/HHH-16337
-        // Tracked via GitHub issue: https://github.com/keycloak/keycloak/issues/19162
-        if (this.uris != null) {
-            this.uris.clear();
-            if (uris != null) {
-                this.uris.addAll(uris);
-            }
-        } else {
-            this.uris = uris;
-        }
+        this.uris = uris;
     }
 
     public String getType() {
diff --git a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/ClientEntity.java b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/ClientEntity.java
index 1ec4d83bd4..6535e26e87 100755
--- a/model/jpa/src/main/java/org/keycloak/models/jpa/entities/ClientEntity.java
+++ b/model/jpa/src/main/java/org/keycloak/models/jpa/entities/ClientEntity.java
@@ -226,14 +226,7 @@ public class ClientEntity {
     }
 
     public void setWebOrigins(Set<String> webOrigins) {
-        // Workaround to avoid a problem in Hibernate 6.2.CR3: https://hibernate.atlassian.net/browse/HHH-16337
-        // Tracked via GitHub issue: https://github.com/keycloak/keycloak/issues/19162
-        if (this.webOrigins != null) {
-            this.webOrigins.clear();
-            this.webOrigins.addAll(webOrigins);
-        } else {
-            this.webOrigins = webOrigins;
-        }
+        this.webOrigins = webOrigins;
     }
 
     public Set<String> getRedirectUris() {
@@ -244,14 +237,7 @@ public class ClientEntity {
     }
 
     public void setRedirectUris(Set<String> redirectUris) {
-        // Workaround to avoid a problem in Hibernate 6.2.CR3: https://hibernate.atlassian.net/browse/HHH-16337
-        // Tracked via GitHub issue: https://github.com/keycloak/keycloak/issues/19162
-        if (this.redirectUris != null) {
-            this.redirectUris.clear();
-            this.redirectUris.addAll(redirectUris);
-        } else {
-            this.redirectUris = redirectUris;
-        }
+        this.redirectUris = redirectUris;
     }
 
     public String getClientAuthenticatorType() {