diff --git a/lib/cartodb/models/dataview/aggregation.js b/lib/cartodb/models/dataview/aggregation.js
index 71574ac5..e61b1454 100644
--- a/lib/cartodb/models/dataview/aggregation.js
+++ b/lib/cartodb/models/dataview/aggregation.js
@@ -9,10 +9,8 @@ var filteredQueryTpl = dot.template([
     'filtered_source AS (',
     '  SELECT *',
     '  FROM ({{=it._query}}) _cdb_filtered_source',
-    '  WHERE',
-    '    {{=it._column}} IS NOT NULL',
     '  {{?it._aggregationColumn}}',
-    '  AND',
+    '  WHERE',
     '    {{=it._aggregationColumn}} != \'infinity\'::float',
     '  AND',
     '    {{=it._aggregationColumn}} != \'-infinity\'::float',