diff --git a/spring-web/src/main/java/org/springframework/http/codec/FormHttpMessageWriter.java b/spring-web/src/main/java/org/springframework/http/codec/FormHttpMessageWriter.java
index c27d0b0cc0..ebe0b01f10 100644
--- a/spring-web/src/main/java/org/springframework/http/codec/FormHttpMessageWriter.java
+++ b/spring-web/src/main/java/org/springframework/http/codec/FormHttpMessageWriter.java
@@ -134,7 +134,8 @@ public class FormHttpMessageWriter extends LoggingCodecSupport
 			if (logger.isDebugEnabled()) {
 				String s = Hints.getLogPrefix(hints) + "Writing " +
 						(isEnableLoggingRequestDetails() ?
-								form.toString() : "form fields " + form.keySet() + " (content masked)");
+								formatValue(form, logger.isTraceEnabled()) :
+								"form fields " + form.keySet() + " (content masked)");
 				if (logger.isTraceEnabled()) {
 					logger.trace(s);
 				}
diff --git a/spring-web/src/main/java/org/springframework/http/codec/multipart/MultipartHttpMessageReader.java b/spring-web/src/main/java/org/springframework/http/codec/multipart/MultipartHttpMessageReader.java
index 791b62610c..79fe01e2ca 100644
--- a/spring-web/src/main/java/org/springframework/http/codec/multipart/MultipartHttpMessageReader.java
+++ b/spring-web/src/main/java/org/springframework/http/codec/multipart/MultipartHttpMessageReader.java
@@ -97,7 +97,8 @@ public class MultipartHttpMessageReader extends LoggingCodecSupport
 					if (logger.isDebugEnabled()) {
 						String s = Hints.getLogPrefix(hints) + "Parsed " +
 								(isEnableLoggingRequestDetails() ?
-										map.toString() : "parts " + map.keySet() + " (content masked)");
+										formatValue(map, logger.isTraceEnabled()) :
+										"parts " + map.keySet() + " (content masked)");
 						if (logger.isTraceEnabled()) {
 							logger.trace(s);
 						}
diff --git a/spring-web/src/main/java/org/springframework/http/codec/multipart/MultipartHttpMessageWriter.java b/spring-web/src/main/java/org/springframework/http/codec/multipart/MultipartHttpMessageWriter.java
index 7a7a940617..c1e35f3459 100644
--- a/spring-web/src/main/java/org/springframework/http/codec/multipart/MultipartHttpMessageWriter.java
+++ b/spring-web/src/main/java/org/springframework/http/codec/multipart/MultipartHttpMessageWriter.java
@@ -228,7 +228,8 @@ public class MultipartHttpMessageWriter extends LoggingCodecSupport
 		if (logger.isDebugEnabled()) {
 			String s = Hints.getLogPrefix(hints) + "Encoding " +
 					(isEnableLoggingRequestDetails() ?
-							map.toString() : "parts " + map.keySet() + " (content masked)");
+							formatValue(map, logger.isTraceEnabled()) :
+							"parts " + map.keySet() + " (content masked)");
 			if (logger.isTraceEnabled()) {
 				logger.trace(s);
 			}
diff --git a/spring-web/src/main/java/org/springframework/http/codec/multipart/SynchronossPartHttpMessageReader.java b/spring-web/src/main/java/org/springframework/http/codec/multipart/SynchronossPartHttpMessageReader.java
index 23e4615647..4168ed02a8 100644
--- a/spring-web/src/main/java/org/springframework/http/codec/multipart/SynchronossPartHttpMessageReader.java
+++ b/spring-web/src/main/java/org/springframework/http/codec/multipart/SynchronossPartHttpMessageReader.java
@@ -96,8 +96,10 @@ public class SynchronossPartHttpMessageReader extends LoggingCodecSupport implem
 		return Flux.create(new SynchronossPartGenerator(message, this.bufferFactory, this.streamStorageFactory))
 				.doOnNext(part -> {
 					if (logger.isDebugEnabled() && !Hints.isLoggingSuppressed(hints)) {
-						String s = Hints.getLogPrefix(hints) + "Parsed " + (isEnableLoggingRequestDetails() ?
-								part.toString() : "parts '" + part.name() + "' (content masked)");
+						String s = Hints.getLogPrefix(hints) + "Parsed " +
+								(isEnableLoggingRequestDetails() ?
+										formatValue(part, logger.isTraceEnabled()) :
+										"parts '" + part.name() + "' (content masked)");
 						if (logger.isTraceEnabled()) {
 							logger.trace(s);
 						}