diff --git a/lib/cartodb/controllers/map.js b/lib/cartodb/controllers/map.js
index 0c860f05..94418b77 100644
--- a/lib/cartodb/controllers/map.js
+++ b/lib/cartodb/controllers/map.js
@@ -293,27 +293,27 @@ MapController.prototype.instantiateTemplate = function(req, res, prepareParamsFn
             if (err) {
                 err.label = 'NAMED MAP LAYERGROUP';
                 next(err);
+            }
+
+            const { layergroup } = res.locals;
+
+            var templateHash = self.templateMaps.fingerPrint(mapConfigProvider.template).substring(0, 8);
+            layergroup.layergroupid = cdbuser + '@' + templateHash + '@' + layergroup.layergroupid;
+
+            var _mapConfig = mapConfig.obj();
+            self.addDataviewsAndWidgetsUrls(cdbuser, layergroup, _mapConfig);
+            self.addAnalysesMetadata(cdbuser, layergroup, mapConfigProvider.analysesResults);
+            addContextMetadata(layergroup, _mapConfig, mapConfigProvider.context);
+
+            res.set('X-Layergroup-Id', layergroup.layergroupid);
+            self.surrogateKeysCache.tag(res, new NamedMapsCacheEntry(cdbuser, mapConfigProvider.getTemplateName()));
+
+            res.status(200);
+
+            if (req.query && req.query.callback) {
+                res.jsonp(layergroup);
             } else {
-                const { layergroup } = res.locals;
-
-                var templateHash = self.templateMaps.fingerPrint(mapConfigProvider.template).substring(0, 8);
-                layergroup.layergroupid = cdbuser + '@' + templateHash + '@' + layergroup.layergroupid;
-
-                var _mapConfig = mapConfig.obj();
-                self.addDataviewsAndWidgetsUrls(cdbuser, layergroup, _mapConfig);
-                self.addAnalysesMetadata(cdbuser, layergroup, mapConfigProvider.analysesResults);
-                addContextMetadata(layergroup, _mapConfig, mapConfigProvider.context);
-
-                res.set('X-Layergroup-Id', layergroup.layergroupid);
-                self.surrogateKeysCache.tag(res, new NamedMapsCacheEntry(cdbuser, mapConfigProvider.getTemplateName()));
-
-                res.status(200);
-
-                if (req.query && req.query.callback) {
-                    res.jsonp(layergroup);
-                } else {
-                    res.json(layergroup);
-                }
+                res.json(layergroup);
             }
         }
     );