diff --git a/frontend/src/metabase/query_builder/components/AggregationWidget.jsx b/frontend/src/metabase/query_builder/components/AggregationWidget.jsx
index f8f44f9e5e6a6a5fc6845e5b8b4d9e463e77ae2e..7474ce6ecf07f7a7b7fbc10296e6b1bf5c80d909 100644
--- a/frontend/src/metabase/query_builder/components/AggregationWidget.jsx
+++ b/frontend/src/metabase/query_builder/components/AggregationWidget.jsx
@@ -48,7 +48,8 @@ export default class AggregationWidget extends Component {
         const fieldId = AggregationClause.getField(aggregation);
 
         let selectedAggregation = getAggregator(AggregationClause.getOperator(aggregation));
-        if (!_.findWhere(tableMetadata.aggregation_options, { short: selectedAggregation.short })) {
+        console.log("Selected Aggregation", selectedAggregation)
+        if (selectedAggregation && !_.findWhere(tableMetadata.aggregation_options, { short: selectedAggregation.short })) {
             // if this table doesn't support the selected aggregation, prompt the user to select a different one
             selectedAggregation = null;
         }