diff --git a/configuration-metadata/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/TypeUtils.java b/configuration-metadata/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/TypeUtils.java
index 9154d5a76b80..bc1332200938 100644
--- a/configuration-metadata/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/TypeUtils.java
+++ b/configuration-metadata/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/TypeUtils.java
@@ -272,8 +272,11 @@ private String cleanUpJavaDoc(String javadoc) {
 		char lastChar = '.';
 		for (int i = 0; i < javadoc.length(); i++) {
 			char ch = javadoc.charAt(i);
+			if (ch == '\r' || ch == '\n') {
+				ch = ' ';
+			}
 			boolean repeatedSpace = ch == ' ' && lastChar == ' ';
-			if (ch != '\r' && ch != '\n' && !repeatedSpace) {
+			if (!repeatedSpace) {
 				result.append(ch);
 				lastChar = ch;
 			}