diff --git a/lib/cartodb/cartodb_windshaft.js b/lib/cartodb/cartodb_windshaft.js
index 0d0ecc3b..25d35b09 100644
--- a/lib/cartodb/cartodb_windshaft.js
+++ b/lib/cartodb/cartodb_windshaft.js
@@ -50,12 +50,13 @@ var CartodbWindshaft = function(serverOptions) {
     var template_baseurl = global.environment.base_url_templated || '(?:/maps/named|/tiles/template)';
 
     var signedMaps = new SignedMaps(redisPool);
-
     serverOptions.signedMaps = signedMaps;
+
     var templateMapsOpts = {
       max_user_templates: global.environment.maxUserTemplates
     };
     var templateMaps = new TemplateMaps(redisPool, signedMaps, templateMapsOpts);
+    serverOptions.templateMaps = templateMaps;
 
     // boot
     var ws = new Windshaft.Server(serverOptions);