diff --git a/lib/cartodb/cartodb_windshaft.js b/lib/cartodb/cartodb_windshaft.js
index 362ed906..64e349b8 100644
--- a/lib/cartodb/cartodb_windshaft.js
+++ b/lib/cartodb/cartodb_windshaft.js
@@ -466,7 +466,9 @@ var CartodbWindshaft = function(serverOptions) {
           if ( req.profiler ) req.profiler.done('TemplateMaps_instance');
           if ( err ) throw err;
           layergroup = instance;
-          fakereq = { query: {}, params: {}, headers: _.clone(req.headers) };
+          fakereq = { query: {}, params: {}, headers: _.clone(req.headers),
+            profiler: req.profiler
+          };
           ws.setDBParams(cdbuser, fakereq.params, this);
         },
         function setApiKey(err){
@@ -481,7 +483,8 @@ var CartodbWindshaft = function(serverOptions) {
           ws.createLayergroup(layergroup, fakereq, this);
         },
         function signLayergroup(err, resp) {
-          if ( req.profiler ) req.profiler.done('createLayergroup');
+          // NOTE: createLayergroup uses profiler.start()/end() internally
+          //if ( req.profiler ) req.profiler.done('createLayergroup');
           if ( err ) throw err;
           response = resp;
           var signer = cdbuser;