diff --git a/lib/cartodb/models/dataview/aggregation.js b/lib/cartodb/models/dataview/aggregation.js
index 6e46ea31..71574ac5 100644
--- a/lib/cartodb/models/dataview/aggregation.js
+++ b/lib/cartodb/models/dataview/aggregation.js
@@ -11,12 +11,14 @@ var filteredQueryTpl = dot.template([
     '  FROM ({{=it._query}}) _cdb_filtered_source',
     '  WHERE',
     '    {{=it._column}} IS NOT NULL',
+    '  {{?it._aggregationColumn}}',
     '  AND',
     '    {{=it._aggregationColumn}} != \'infinity\'::float',
     '  AND',
     '    {{=it._aggregationColumn}} != \'-infinity\'::float',
     '  AND',
     '    {{=it._aggregationColumn}} != \'NaN\'::float',
+    '  {{?}}',
     ')'
 ].join(' \n'));