diff --git a/raml-to-jaxrs/jaxrs-code-generator/src/main/java/org/raml/jaxrs/generator/builders/resources/ResourceBuilder.java b/raml-to-jaxrs/jaxrs-code-generator/src/main/java/org/raml/jaxrs/generator/builders/resources/ResourceBuilder.java
index 974c59238..bc93b3353 100644
--- a/raml-to-jaxrs/jaxrs-code-generator/src/main/java/org/raml/jaxrs/generator/builders/resources/ResourceBuilder.java
+++ b/raml-to-jaxrs/jaxrs-code-generator/src/main/java/org/raml/jaxrs/generator/builders/resources/ResourceBuilder.java
@@ -209,8 +209,7 @@ private void createParamteter(MethodSpec.Builder methodSpec, GRequest gRequest,
       return;
     }
 
-    if (gRequest.type().name().equals("any") && "application/octet-stream".equals(gRequest.mediaType())) {
-
+    if (gRequest.type().name().equals("any")) {
       TypeName typeName = ClassName.get(InputStream.class);
       methodSpec.addParameter(ParameterSpec.builder(typeName, "entity").build());
     } else {
@@ -450,7 +449,7 @@ public ResponseClassExtension<GMethod> apply(@Nullable Collection<ResponseClassE
 
   private TypeName createResponseParameter(GResponseType responseType, MethodSpec.Builder builder) {
 
-    if ("application/octet-stream".equals(responseType.mediaType()) && "any".equals(responseType.type().name())) {
+    if ("any".equals(responseType.type().name())) {
 
       TypeName typeName = ClassName.get(StreamingOutput.class);
       builder.addParameter(ParameterSpec.builder(typeName, "entity").build());