diff --git a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/BasePathAwareHandlerMapping.java b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/BasePathAwareHandlerMapping.java
index 90f772c33..b364a3e9f 100644
--- a/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/BasePathAwareHandlerMapping.java
+++ b/spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/BasePathAwareHandlerMapping.java
@@ -109,6 +109,9 @@ public class BasePathAwareHandlerMapping extends RequestMappingHandlerMapping {
 			mediaTypes.add(configuration.getDefaultMediaType());
 		}
 
+		// DATAREST-1390 - Temporary workaround
+		request.setAttribute(ProducesRequestCondition.class.getName() + ".MEDIA_TYPES", mediaTypes);
+
 		return super.lookupHandlerMethod(lookupPath, new CustomAcceptHeaderHttpServletRequest(request, mediaTypes));
 	}