diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/rx/RxJavaAutoConfiguration.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/rx/RxJavaAutoConfiguration.java
index d6c704b52..2391a0bfc 100644
--- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/rx/RxJavaAutoConfiguration.java
+++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/rx/RxJavaAutoConfiguration.java
@@ -39,7 +39,7 @@ import rx.Single;
 public class RxJavaAutoConfiguration {
 
 	@Configuration
-	@ConditionalOnClass(AsyncHandlerMethodReturnValueHandler.class)
+	@ConditionalOnClass({ AsyncHandlerMethodReturnValueHandler.class, WebMvcConfigurerAdapter.class })
 	protected static class RxJavaReturnValueHandlerConfig {
 		@Bean
 		public SingleReturnValueHandler singleReturnValueHandler() {