diff --git a/resources/frontend_client/app/query_builder/filters/pickers/SelectPicker.react.js b/resources/frontend_client/app/query_builder/filters/pickers/SelectPicker.react.js
index 0b6827d11faeae5fe3f64d1c65ca98e80ea5ebac..c4fdb27d5a429835698c754e1391ec221a2c6f5a 100644
--- a/resources/frontend_client/app/query_builder/filters/pickers/SelectPicker.react.js
+++ b/resources/frontend_client/app/query_builder/filters/pickers/SelectPicker.react.js
@@ -6,7 +6,12 @@ import CheckBox from 'metabase/components/CheckBox.react';
 
 export default class SelectPicker extends Component {
     selectValue(key, selected) {
-        let values = this.props.values.slice().filter(v => v != null);
+        let values;
+        if (this.props.multi) {
+            values = this.props.values.slice().filter(v => v != null);
+        } else {
+            values = []
+        }
         if (selected) {
             values.push(key);
         } else {