diff --git a/spring-web-reactive/src/main/java/org/springframework/core/convert/support/ReactiveStreamsToCompletableFutureConverter.java b/spring-web-reactive/src/main/java/org/springframework/core/convert/support/ReactiveStreamsToCompletableFutureConverter.java
index a20c50e1c2..707b5c8078 100644
--- a/spring-web-reactive/src/main/java/org/springframework/core/convert/support/ReactiveStreamsToCompletableFutureConverter.java
+++ b/spring-web-reactive/src/main/java/org/springframework/core/convert/support/ReactiveStreamsToCompletableFutureConverter.java
@@ -48,7 +48,7 @@ public class ReactiveStreamsToCompletableFutureConverter implements GenericConve
 			return Mono.fromCompletableFuture((CompletableFuture)source);
 		}
 		else if (CompletableFuture.class.isAssignableFrom(targetType.getResolvableType().getRawClass())) {
-			return reactor.core.converter.CompletableFutureConverter.fromSingle((Publisher) source);
+			return Mono.from((Publisher)source).toCompletableFuture();
 		}
 		return null;
 	}