diff --git a/lib/cartodb/controllers/named_maps_admin.js b/lib/cartodb/controllers/named_maps_admin.js
index b8bd89dd..d3e52f77 100644
--- a/lib/cartodb/controllers/named_maps_admin.js
+++ b/lib/cartodb/controllers/named_maps_admin.js
@@ -26,13 +26,19 @@ util.inherits(NamedMapsAdminController, BaseController);
 
 module.exports = NamedMapsAdminController;
 
-NamedMapsAdminController.prototype.register = function(app) {
-    app.post(app.base_url_templated, cors(), userMiddleware, this.create.bind(this));
-    app.put(app.base_url_templated + '/:template_id', cors(), userMiddleware, this.update.bind(this));
-    app.get(app.base_url_templated + '/:template_id', cors(), userMiddleware, this.retrieve.bind(this));
-    app.delete(app.base_url_templated + '/:template_id', cors(), userMiddleware, this.destroy.bind(this));
-    app.get(app.base_url_templated, cors(), userMiddleware, this.list.bind(this));
-    app.options(app.base_url_templated + '/:template_id', cors('Content-Type'));
+NamedMapsAdminController.prototype.register = function (router) {
+    router.options('/:template_id', cors('Content-Type'));
+
+    router.use(
+        cors(),
+        userMiddleware
+    );
+
+    router.post('/', this.create.bind(this));
+    router.put('/:template_id', this.update.bind(this));
+    router.get('/:template_id', this.retrieve.bind(this));
+    router.delete('/:template_id', this.destroy.bind(this));
+    router.get('/', this.list.bind(this));
 };
 
 NamedMapsAdminController.prototype.create = function(req, res, next) {
diff --git a/lib/cartodb/server.js b/lib/cartodb/server.js
index 1c65e89a..75b26145 100644
--- a/lib/cartodb/server.js
+++ b/lib/cartodb/server.js
@@ -253,12 +253,12 @@ module.exports = function(serverOptions) {
         metadataBackend
     ).register(app);
 
-    new controller.NamedMapsAdmin(authApi, pgConnection, templateMaps).register(app);
+    const namedMapsAdminRouter = express.Router();
+    new controller.NamedMapsAdmin(authApi, pgConnection, templateMaps).register(namedMapsAdminRouter);
+    app.use(app.base_url_templated, namedMapsAdminRouter);
 
     const analysisRouter = express.Router();
-
     new controller.Analyses(authApi, pgConnection).register(analysisRouter);
-
     app.use(app.base_url_mapconfig, analysisRouter);
 
     new controller.ServerInfo(versions).register(app);