diff --git a/modules/swagger-codegen/src/main/resources/Java/apiInvoker.mustache b/modules/swagger-codegen/src/main/resources/Java/apiInvoker.mustache
index 0104dc16b3e..0255a11ad8a 100644
--- a/modules/swagger-codegen/src/main/resources/Java/apiInvoker.mustache
+++ b/modules/swagger-codegen/src/main/resources/Java/apiInvoker.mustache
@@ -108,7 +108,7 @@ public class ApiInvoker {
   }
 
   public static String selectHeaderAccept(String[] accepts) {
-    if (accepts.length == 0) return "application/json";
+    if (accepts.length == 0) return null;
     if (StringUtil.containsIgnoreCase(accepts, "application/json")) return "application/json";
     return StringUtil.join(accepts, ",");
   }
@@ -194,7 +194,11 @@ public class ApiInvoker {
     }
     String querystring = b.toString();
 
-    Builder builder = client.resource(host + path + querystring).accept(accept);
+    Builder builder;
+    if (accept == null)
+      builder = client.resource(host + path + querystring).getRequestBuilder();
+    else
+      builder = client.resource(host + path + querystring).accept(accept);
     for(String key : headerParams.keySet()) {
       builder = builder.header(key, headerParams.get(key));
     }
diff --git a/samples/client/petstore/java/src/main/java/io/swagger/client/ApiInvoker.java b/samples/client/petstore/java/src/main/java/io/swagger/client/ApiInvoker.java
index 440f2e0e0b4..e1bfbe12873 100644
--- a/samples/client/petstore/java/src/main/java/io/swagger/client/ApiInvoker.java
+++ b/samples/client/petstore/java/src/main/java/io/swagger/client/ApiInvoker.java
@@ -108,7 +108,7 @@ public class ApiInvoker {
   }
 
   public static String selectHeaderAccept(String[] accepts) {
-    if (accepts.length == 0) return "application/json";
+    if (accepts.length == 0) return null;
     if (StringUtil.containsIgnoreCase(accepts, "application/json")) return "application/json";
     return StringUtil.join(accepts, ",");
   }
@@ -194,7 +194,11 @@ public class ApiInvoker {
     }
     String querystring = b.toString();
 
-    Builder builder = client.resource(host + path + querystring).accept(accept);
+    Builder builder;
+    if (accept == null)
+      builder = client.resource(host + path + querystring).getRequestBuilder();
+    else
+      builder = client.resource(host + path + querystring).accept(accept);
     for(String key : headerParams.keySet()) {
       builder = builder.header(key, headerParams.get(key));
     }
diff --git a/samples/client/petstore/java/src/test/java/io/swagger/client/ApiInvokerTest.java b/samples/client/petstore/java/src/test/java/io/swagger/client/ApiInvokerTest.java
index ec5a54c2aa9..f117e6364df 100644
--- a/samples/client/petstore/java/src/test/java/io/swagger/client/ApiInvokerTest.java
+++ b/samples/client/petstore/java/src/test/java/io/swagger/client/ApiInvokerTest.java
@@ -19,7 +19,7 @@ public class ApiInvokerTest {
     assertEquals("text/plain,application/xml", ApiInvoker.selectHeaderAccept(accepts));
 
     accepts = new String[] { };
-    assertEquals("application/json", ApiInvoker.selectHeaderAccept(accepts));
+    assertNull(ApiInvoker.selectHeaderAccept(accepts));
   }
 
   @Test