diff --git a/test/e2e-specs.js b/test/e2e-specs.js
index ec1349d..a54b453 100644
--- a/test/e2e-specs.js
+++ b/test/e2e-specs.js
@@ -898,7 +898,7 @@ const tests = [
     }, resolve, reject); },
     validationFunc: function (driver, result) {
       result.type.should.be.equal('resolved');
-      should.equal(null, result.data.data);
+      should.equal('', result.data.data);
     }
   },
 
diff --git a/test/js-specs.js b/test/js-specs.js
index 253841e..b8710a9 100644
--- a/test/js-specs.js
+++ b/test/js-specs.js
@@ -449,7 +449,7 @@ describe('Common helpers', function () {
       const helpers = require('../www/helpers')(null, jsUtil, null, messages, null, errorCodes);
       const handler = helpers.injectRawResponseHandler(
         'json',
-        response => should.equal(null, response.data)
+        response => should.equal('', response.data)
       );
 
       handler({ data: emptyData });
@@ -469,7 +469,7 @@ describe('Common helpers', function () {
       const helpers = require('../www/helpers')(null, jsUtil, null, messages, fakeBase64, errorCodes);
       const handler = helpers.injectRawResponseHandler(
         'arraybuffer',
-        response => should.equal(null, response.data)
+        response => should.equal('', response.data)
       );
 
       handler({ data: '' });
@@ -494,7 +494,7 @@ describe('Common helpers', function () {
       const handler = helpers.injectRawResponseHandler(
         'blob',
         (response) => {
-          should.equal(null, response.data)
+          should.equal('', response.data)
         }
       );
 
diff --git a/www/helpers.js b/www/helpers.js
index 66e20aa..c930e67 100644
--- a/www/helpers.js
+++ b/www/helpers.js
@@ -293,8 +293,6 @@ module.exports = function init(global, jsUtil, cookieHandler, messages, base64,
       }
 
       if (!response.data) {
-        // return null as data if response data is not set
-        response.data = null;
         return success(response);
       }