diff --git a/superset/assets/src/explore/components/controls/AdhocFilterControl.jsx b/superset/assets/src/explore/components/controls/AdhocFilterControl.jsx
index abd8778f405a1..3a12c2a7b3dac 100644
--- a/superset/assets/src/explore/components/controls/AdhocFilterControl.jsx
+++ b/superset/assets/src/explore/components/controls/AdhocFilterControl.jsx
@@ -206,7 +206,7 @@ export default class AdhocFilterControl extends React.Component {
   optionsForSelect(props) {
     const options = [
       ...props.columns,
-      ...[...props.formData.metrics, props.formData.metric].map(metric => (
+      ...[...(props.formData.metrics || []), props.formData.metric].map(metric => (
         metric && (
           typeof metric === 'string' ?
           { saved_metric_name: metric } :