diff --git a/lib/cartodb/models/mapconfig/adapter/aggregation-mapconfig-adapter.js b/lib/cartodb/models/mapconfig/adapter/aggregation-mapconfig-adapter.js
index 79bd6527..28cbffc9 100644
--- a/lib/cartodb/models/mapconfig/adapter/aggregation-mapconfig-adapter.js
+++ b/lib/cartodb/models/mapconfig/adapter/aggregation-mapconfig-adapter.js
@@ -101,18 +101,13 @@ module.exports = class AggregationMapConfigAdapter {
                     aggregationSql = sqlQueryWrap.replace(/<%=\s*sql\s*%>/g, aggregationSql);
                 }
 
-                if (!mapConfig.isDefaultLayerAggregation(index)) {
-                    layer.options.sql = aggregationSql;
-                    return resolve({ layer, index, adapted: shouldAdapt });
-                }
+                layer.options.sql = aggregationSql;
 
-                const skipGeoms = true;
-                mapConfig.getLayerColumns(index, skipGeoms, (err, columns) => {
+                mapConfig.getLayerAggregationColumns(index, (err, columns) => {
                     if (err) {
                         return reject(err);
                     }
 
-                    layer.options.sql = aggregationSql;
                     layer.options.columns = columns;
 
                     return resolve({ layer, index, adapted: shouldAdapt });