diff --git a/src/main/java/org/springframework/hateoas/config/WebClientConfigurer.java b/src/main/java/org/springframework/hateoas/config/WebClientConfigurer.java
index e68c95a6..6da0d8a4 100644
--- a/src/main/java/org/springframework/hateoas/config/WebClientConfigurer.java
+++ b/src/main/java/org/springframework/hateoas/config/WebClientConfigurer.java
@@ -75,15 +75,8 @@ public class WebClientConfigurer {
 
 			CustomCodecs codecs = it.customCodecs();
 
-			encoders.forEach(encoder -> codecs.register(encoder));
-			decoders.forEach(decoder -> codecs.registerWithDefaultConfig(decoder, config -> {
-
-				Integer maxInMemorySize = config.maxInMemorySize();
-
-				if (maxInMemorySize != null) {
-					decoder.setMaxInMemorySize(maxInMemorySize);
-				}
-			}));
+			encoders.forEach(codecs::registerWithDefaultConfig);
+			decoders.forEach(codecs::registerWithDefaultConfig);
 		};
 	}
 
diff --git a/src/main/java/org/springframework/hateoas/config/WebFluxHateoasConfiguration.java b/src/main/java/org/springframework/hateoas/config/WebFluxHateoasConfiguration.java
index fd96894a..e29ef05f 100644
--- a/src/main/java/org/springframework/hateoas/config/WebFluxHateoasConfiguration.java
+++ b/src/main/java/org/springframework/hateoas/config/WebFluxHateoasConfiguration.java
@@ -115,8 +115,8 @@ class WebFluxHateoasConfiguration {
 
 		public void registerCodecs(CustomCodecs codecs) {
 
-			decoders.forEach(codecs::decoder);
-			encoders.forEach(codecs::encoder);
+			decoders.forEach(codecs::registerWithDefaultConfig);
+			encoders.forEach(codecs::registerWithDefaultConfig);
 		}
 
 		private static Decoder<?> getDecoder(ObjectMapper mapper, List<MediaType> mediaTypes) {