diff --git a/frontend/src/metabase/query_builder/components/AggregationPopover.jsx b/frontend/src/metabase/query_builder/components/AggregationPopover.jsx
index 583978b67b8e6ec18dd3542ae5e11eb60a532a62..bdbe798a1512433f591dd9405aaefbbf3d2f1ecd 100644
--- a/frontend/src/metabase/query_builder/components/AggregationPopover.jsx
+++ b/frontend/src/metabase/query_builder/components/AggregationPopover.jsx
@@ -155,7 +155,7 @@ export default class AggregationPopover extends Component {
 
         sections[0].items.push({
             name: "Custom Aggregation",
-            value: aggregation,
+            value: aggregation !== "rows" && !_.isEqual(aggregation, ["rows"]) ? aggregation : null,
             custom: true,
             isSelected: (aggregation) => AggregationClause.isCustom(aggregation)
         })