diff --git a/lib/cartodb/controllers/analyses.js b/lib/cartodb/controllers/analyses.js
index c8acd2cc..49144963 100644
--- a/lib/cartodb/controllers/analyses.js
+++ b/lib/cartodb/controllers/analyses.js
@@ -20,11 +20,14 @@ util.inherits(AnalysesController, BaseController);
 
 module.exports = AnalysesController;
 
-AnalysesController.prototype.register = function(app) {
-    app.get(
-        app.base_url_mapconfig + '/analyses/catalog',
+AnalysesController.prototype.register = function(router) {
+    router.use(
         cors(),
-        userMiddleware,
+        userMiddleware
+    );
+
+    router.get(
+        '/analyses/catalog',
         this.req2paramsMiddleware,
         this.catalog.bind(this)
     );
diff --git a/lib/cartodb/server.js b/lib/cartodb/server.js
index 784d7f6c..1c65e89a 100644
--- a/lib/cartodb/server.js
+++ b/lib/cartodb/server.js
@@ -255,7 +255,11 @@ module.exports = function(serverOptions) {
 
     new controller.NamedMapsAdmin(authApi, pgConnection, templateMaps).register(app);
 
-    new controller.Analyses(authApi, pgConnection).register(app);
+    const analysisRouter = express.Router();
+
+    new controller.Analyses(authApi, pgConnection).register(analysisRouter);
+
+    app.use(app.base_url_mapconfig, analysisRouter);
 
     new controller.ServerInfo(versions).register(app);