diff --git a/lib/cartodb/middleware/context/db-conn-setup.js b/lib/cartodb/middleware/context/db-conn-setup.js
index 97efb77d..8b05d36b 100644
--- a/lib/cartodb/middleware/context/db-conn-setup.js
+++ b/lib/cartodb/middleware/context/db-conn-setup.js
@@ -12,7 +12,7 @@ module.exports = function dbConnSetupMiddleware(pgConnection) {
                     err.http_status = 404;
                 }
                 req.profiler.done('req2params');
-                return next(err, req);
+                return next(err);
             }
 
             // Add default database connection parameters
@@ -33,7 +33,7 @@ module.exports = function dbConnSetupMiddleware(pgConnection) {
 
             req.profiler.done('req2params');
 
-            next(null, req);
+            next(null);
         });
     };
 };
diff --git a/test/unit/cartodb/prepare-context.test.js b/test/unit/cartodb/prepare-context.test.js
index a9119c13..af40f1da 100644
--- a/test/unit/cartodb/prepare-context.test.js
+++ b/test/unit/cartodb/prepare-context.test.js
@@ -108,7 +108,7 @@ describe('prepare-context', function() {
                     locals: {}
                 };
 
-                dbConnSetup(prepareRequest(req), res, function(err, req) {
+                dbConnSetup(prepareRequest(req), res, function () {
                     // wrong key resets params to no user
                     assert.ok(req.params.dbuser === test_pubuser, 'could inject dbuser ('+req.params.dbuser+')');
                     done();