diff --git a/lib/cartodb/controllers/map.js b/lib/cartodb/controllers/map.js
index ac874e59..054a901e 100644
--- a/lib/cartodb/controllers/map.js
+++ b/lib/cartodb/controllers/map.js
@@ -180,6 +180,7 @@ MapController.prototype.create = function(req, res, prepareConfigFn, next) {
         },
         function afterLayergroupCreate(err, layergroup) {
             assert.ifError(err);
+
             res.locals.mapconfig = mapConfig;
             res.locals.analysesResults = context.analysesResults;
             res.locals.layergroup = layergroup;
@@ -273,8 +274,8 @@ MapController.prototype.instantiateTemplate = function(req, res, prepareParamsFn
             res.locals.analysesResults = mapConfigProvider.analysesResults;
             res.locals.layergroup = layergroup;
             res.locals.template = mapConfigProvider.template;
-            res.locals.context = mapConfigProvider.context;
             res.locals.templateName = mapConfigProvider.getTemplateName();
+            res.locals.context = mapConfigProvider.context;
 
             const afterLayergroupCreate = self.afterLayergroupCreateBuilder({
                 useTemplateHash: true