diff --git a/lib/cartodb/models/mapconfig/adapter/aggregation-mapconfig-adapter.js b/lib/cartodb/models/mapconfig/adapter/aggregation-mapconfig-adapter.js
index 3897121a..c3afa7d0 100644
--- a/lib/cartodb/models/mapconfig/adapter/aggregation-mapconfig-adapter.js
+++ b/lib/cartodb/models/mapconfig/adapter/aggregation-mapconfig-adapter.js
@@ -116,16 +116,16 @@ module.exports = class AggregationMapConfigAdapter {
 
             const result = res.rows[0] || {};
 
-            if (!mapConfig.doesLayerReachThreshold(index, result.count)) {
-                return callback(null, false);
-            }
-
             if (!AggregationMapConfig.supportsGeometryType(result.type)) {
                 return callback(new Error(unsupportedGeometryTypeErrorMessage({
                     geometryType: result.type
                 })));
             }
 
+            if (!mapConfig.doesLayerReachThreshold(index, result.count)) {
+                return callback(null, false);
+            }
+
             callback(null, true);
         });
     }