diff --git a/impl/src/main/java/com/sun/faces/application/applicationimpl/InstanceFactory.java b/impl/src/main/java/com/sun/faces/application/applicationimpl/InstanceFactory.java
index 7617eec378..64c72994f9 100644
--- a/impl/src/main/java/com/sun/faces/application/applicationimpl/InstanceFactory.java
+++ b/impl/src/main/java/com/sun/faces/application/applicationimpl/InstanceFactory.java
@@ -115,7 +115,7 @@ public class InstanceFactory {
     }
 
     private final String[] STANDARD_BY_TYPE_CONVERTER_CLASSES = { "java.math.BigDecimal", "java.lang.Boolean", "java.lang.Byte", "java.lang.Character",
-            "java.lang.Double", "java.lang.Float", "java.lang.Integer", "java.lang.Long", "java.lang.Short", "java.lang.Enum" };
+            "java.lang.Double", "java.lang.Float", "java.lang.Integer", "java.lang.Long", "java.lang.Short", "java.lang.Enum", "java.util.UUID" };
 
     private Map<Class<?>, Object> converterTypeMap;
     private boolean registerPropertyEditors;
diff --git a/impl/src/main/java/com/sun/faces/config/configpopulator/MojarraRuntimePopulator.java b/impl/src/main/java/com/sun/faces/config/configpopulator/MojarraRuntimePopulator.java
index 2e57f29900..ab5a176790 100644
--- a/impl/src/main/java/com/sun/faces/config/configpopulator/MojarraRuntimePopulator.java
+++ b/impl/src/main/java/com/sun/faces/config/configpopulator/MojarraRuntimePopulator.java
@@ -485,6 +485,20 @@ public void populateApplicationConfiguration(Document toPopulate) {
             }
             faces_configElement.appendChild(converterElement);
         }
+        {
+            Element converterElement = toPopulate.createElementNS(ns, "converter");
+            {
+                Element converter_for_classElement = toPopulate.createElementNS(ns, "converter-for-class");
+                converter_for_classElement.appendChild(toPopulate.createTextNode("java.util.UUID"));
+                converterElement.appendChild(converter_for_classElement);
+            }
+            {
+                Element converter_classElement = toPopulate.createElementNS(ns, "converter-class");
+                converter_classElement.appendChild(toPopulate.createTextNode("jakarta.faces.convert.UUIDConverter"));
+                converterElement.appendChild(converter_classElement);
+            }
+            faces_configElement.appendChild(converterElement);
+        }
         {
             Element lifecycleElement = toPopulate.createElementNS(ns, "lifecycle");
             {