diff --git a/jOOQ/src/main/java/org/jooq/util/jaxb/tools/XMLBuilder.java b/jOOQ/src/main/java/org/jooq/util/jaxb/tools/XMLBuilder.java
index 1c9218d770..807913fc49 100644
--- a/jOOQ/src/main/java/org/jooq/util/jaxb/tools/XMLBuilder.java
+++ b/jOOQ/src/main/java/org/jooq/util/jaxb/tools/XMLBuilder.java
@@ -91,7 +91,7 @@ public final class XMLBuilder {
     }
 
     public XMLBuilder append(String wrappingElementName, String elementName, List<?> list) {
-        if (list != null) {
+        if (list != null && !list.isEmpty()) {
             openTag(wrappingElementName).newLine().indent();
             for (Object o : list) {
                 if (o instanceof XMLAppendable x)