diff --git a/lib/cartodb/models/mapconfig/adapter/vector-mapconfig-adapter.js b/lib/cartodb/models/mapconfig/adapter/vector-mapconfig-adapter.js
index 14c971e9..3472a4be 100644
--- a/lib/cartodb/models/mapconfig/adapter/vector-mapconfig-adapter.js
+++ b/lib/cartodb/models/mapconfig/adapter/vector-mapconfig-adapter.js
@@ -28,12 +28,17 @@ class VectorMapConfigAdapter {
     }
 
     _wrapDates(requestMapConfig, user) {
-        const originalQuery = requestMapConfig.layers[0].options.sql;
+        return Promise.all(requestMapConfig.layers.map(layer => this._wrapLayer(layer, user)))
+            .then(() => requestMapConfig);
+    }
+
+    _wrapLayer(layer, user) {
+        const originalQuery = layer.options.sql;
         return this._getColumns(user, originalQuery)
             .then(result => {
                 const newSqlQuery = dateWrapper.wrapDates(originalQuery, result.fields);
-                requestMapConfig.layers[0].options.sql = newSqlQuery;
-                return requestMapConfig;
+                layer.options.sql = newSqlQuery;
+                return layer;
             });
     }