diff --git a/lib/cartodb/models/mapconfig/adapter/aggregation-mapconfig-adapter.js b/lib/cartodb/models/mapconfig/adapter/aggregation-mapconfig-adapter.js
index ac7841fb..115632df 100644
--- a/lib/cartodb/models/mapconfig/adapter/aggregation-mapconfig-adapter.js
+++ b/lib/cartodb/models/mapconfig/adapter/aggregation-mapconfig-adapter.js
@@ -81,9 +81,15 @@ module.exports = class AggregationMapConfigAdapter {
 
         if (aggregation === 'false') {
             shouldAdapt = false;
-        } else if (aggregation === 'true') {
+            return shouldAdapt;
+        }
+
+        if (aggregation === 'true') {
             shouldAdapt = true;
-        } else if (aggregation === undefined) {
+            return shouldAdapt;
+        }
+
+        if (aggregation === undefined) {
             if (mapConfig.isVectorOnlyMapConfig()) {
                 shouldAdapt = true;
             } else if (this._hasAnyLayerAggregation(requestMapConfig)){