diff --git a/lib/cartodb/server.js b/lib/cartodb/server.js
index fdc028ce..3bfad338 100644
--- a/lib/cartodb/server.js
+++ b/lib/cartodb/server.js
@@ -132,7 +132,6 @@ module.exports = function(serverOptions) {
         pool: redisPool,
         expire_time: serverOptions.grainstore.default_layergroup_ttl
     });
-    app.mapStore = mapStore;
 
     var onTileErrorStrategy;
     if (global.environment.enabledFeatures.onTileErrorStrategy !== false) {
@@ -521,14 +520,6 @@ module.exports = function(serverOptions) {
             function extractSQL(err) {
                 assert.ifError(err);
 
-                // TODO: cached cache channel for token-based access should
-                //       be constructed at renderer cache creation time
-                // See http://github.com/CartoDB/Windshaft-cartodb/issues/152
-                if ( ! app.mapStore ) {
-                    throw new Error('missing channel cache for token ' + req.params.token);
-                }
-                var mapStore = app.mapStore;
-
                 step(
                     function loadFromStore() {
                         mapStore.load(req.params.token, this);