diff --git a/buildSrc/src/main/java/org/springframework/boot/build/JavaConventions.java b/buildSrc/src/main/java/org/springframework/boot/build/JavaConventions.java
index 6753e3d732b..2b1f053a67d 100644
--- a/buildSrc/src/main/java/org/springframework/boot/build/JavaConventions.java
+++ b/buildSrc/src/main/java/org/springframework/boot/build/JavaConventions.java
@@ -230,10 +230,18 @@ class JavaConventions {
 			CoreJavadocOptions options = (CoreJavadocOptions) javadoc.getOptions();
 			options.source("17");
 			options.encoding("UTF-8");
-			options.addStringOption("Xdoclint:none", "-quiet");
+			addValuelessOption(options, "Xdoclint:none");
+			addValuelessOption(options, "quiet");
+			if (!javadoc.getName().contains("aggregated")) {
+				addValuelessOption(options, "-no-fonts");
+			}
 		});
 	}
 
+	private void addValuelessOption(CoreJavadocOptions options, String option) {
+		options.addMultilineMultiValueOption(option).setValue(List.of(Collections.emptyList()));
+	}
+
 	private void configureJavaConventions(Project project) {
 		if (!project.hasProperty("toolchainVersion")) {
 			JavaPluginExtension javaPluginExtension = project.getExtensions().getByType(JavaPluginExtension.class);