diff --git a/superset/assets/src/explore/components/controls/SelectControl.jsx b/superset/assets/src/explore/components/controls/SelectControl.jsx
index e15bf7ab0..906d867ea 100644
--- a/superset/assets/src/explore/components/controls/SelectControl.jsx
+++ b/superset/assets/src/explore/components/controls/SelectControl.jsx
@@ -92,25 +92,24 @@ export default class SelectControl extends React.PureComponent {
 
   onChange(opt) {
     let optionValue = null;
-    if (!opt) {
-      return;
-    }
-    if (this.props.multi) {
-      optionValue = [];
-      for (const o of opt) {
-        if (o.meta === true) {
-          optionValue = this.getOptions(this.props)
-                            .filter(x => !x.meta)
-                            .map(x => x[this.props.valueKey]);
-          break;
-        } else {
-          optionValue.push(o[this.props.valueKey]);
+    if (opt) {
+      if (this.props.multi) {
+        optionValue = [];
+        for (const o of opt) {
+          if (o.meta === true) {
+            optionValue = this.getOptions(this.props)
+                              .filter(x => !x.meta)
+                              .map(x => x[this.props.valueKey]);
+            break;
+          } else {
+            optionValue.push(o[this.props.valueKey]);
+          }
         }
+      } else if (opt.meta === true) {
+        return;
+      } else {
+        optionValue = opt[this.props.valueKey];
       }
-    } else if (opt.meta === true) {
-      return;
-    } else {
-      optionValue = opt[this.props.valueKey];
     }
     this.props.onChange(optionValue);
   }