diff --git a/CHANGELOG.md b/CHANGELOG.md
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+### 0.17.1.1
+
+* JavaScript/NodeJS: Use the received content-type instead of the accept header to decide whether to parse json.
+
 ### 0.17.1
 
 * Expose `Rest.Gen.Base.ActionInfo.Ident`
diff --git a/files/Javascript/base.js b/files/Javascript/base.js
--- a/files/Javascript/base.js
+++ b/files/Javascript/base.js
@@ -132,7 +132,7 @@
     {
       if (message && message.statusCode >= 200 && message.statusCode < 300)
       {
-        var parsedResponse = parse(body);
+        var parsedResponse = parse(body, message.headers);
         onSuccess && onSuccess(parsedResponse, message);
         resolve(parsedResponse)
       }
@@ -145,7 +145,7 @@
           error.responseBody = body;
         }
 
-        error.response = parse(body);
+        error.response = parse(body, message.headers);
 
         if (onError)
           onError(error);
@@ -155,9 +155,9 @@
     }
   });
 
-  function parse (response)
+  function parse (response, headers)
   {
-    if (acceptHeader.split(";").indexOf('text/json') >= 0)
+    if (headers["content-type"] && headers["content-type"].split(";").indexOf("application/json") >= 0)
     {
       var r = response;
       try
diff --git a/rest-gen.cabal b/rest-gen.cabal
--- a/rest-gen.cabal
+++ b/rest-gen.cabal
@@ -1,5 +1,5 @@
 name:                rest-gen
-version:             0.17.1
+version:             0.17.1.1
 description:         Documentation and client generation from rest definition.
 synopsis:            Documentation and client generation from rest definition.
 maintainer:          code@silk.co