diff --git a/lib/cartodb/middleware/context/db-conn-setup.js b/lib/cartodb/middleware/context/db-conn-setup.js
index ec58c2a1..f658001a 100644
--- a/lib/cartodb/middleware/context/db-conn-setup.js
+++ b/lib/cartodb/middleware/context/db-conn-setup.js
@@ -1,8 +1,8 @@
 const _ = require('underscore');
 
 module.exports = function dbConnSetup (pgConnection) {
-    return function dbConnSetupMiddleware(req, res, next) {
-        const user = res.locals.user;
+    return function dbConnSetupMiddleware (req, res, next) {
+        const { user } = res.locals;
 
         pgConnection.setDBConn(user, res.locals, (err) => {
             req.profiler.done('setDBConn');
@@ -24,7 +24,7 @@ module.exports = function dbConnSetup (pgConnection) {
 
             res.set('X-Served-By-DB-Host', res.locals.dbhost);
 
-            next(null);
+            next();
         });
     };
 };