diff --git a/impl/src/main/java/com/sun/faces/util/Util.java b/impl/src/main/java/com/sun/faces/util/Util.java index 5289d39f71..ca481492aa 100644 --- a/impl/src/main/java/com/sun/faces/util/Util.java +++ b/impl/src/main/java/com/sun/faces/util/Util.java @@ -1677,7 +1677,9 @@ public static String getResponseEncoding(FacesContext context, Optional if (encoding == null) { // 5. If still none found then fall back to specified default. - encoding = defaultEncoding.get(); + if (defaultEncoding.isPresent()) { + encoding = defaultEncoding.get(); + } if (encoding != null && !encoding.isBlank()) { if (LOGGER.isLoggable(FINEST)) {