diff --git a/lib/cartodb/models/mapconfig/adapter/aggregation-mapconfig-adapter.js b/lib/cartodb/models/mapconfig/adapter/aggregation-mapconfig-adapter.js
index 115632df..eed51dbf 100644
--- a/lib/cartodb/models/mapconfig/adapter/aggregation-mapconfig-adapter.js
+++ b/lib/cartodb/models/mapconfig/adapter/aggregation-mapconfig-adapter.js
@@ -89,12 +89,14 @@ module.exports = class AggregationMapConfigAdapter {
             return shouldAdapt;
         }
 
-        if (aggregation === undefined) {
-            if (mapConfig.isVectorOnlyMapConfig()) {
-                shouldAdapt = true;
-            } else if (this._hasAnyLayerAggregation(requestMapConfig)){
-                shouldAdapt = true;
-            }
+        if (aggregation === undefined && mapConfig.isVectorOnlyMapConfig()) {
+            shouldAdapt = true;
+            return shouldAdapt;
+        }
+
+        if (aggregation === undefined && this._hasAnyLayerAggregation(requestMapConfig)){
+            shouldAdapt = true;
+            return shouldAdapt;
         }
 
         return shouldAdapt;