diff --git a/frontend/src/metabase/query_builder/components/filters/pickers/NumberPicker.jsx b/frontend/src/metabase/query_builder/components/filters/pickers/NumberPicker.jsx
index 204594f76215c21ba2319f6c856d8f58fbd6a7a6..910842392f55fd9be4199b399a2d49270cf91be0 100644
--- a/frontend/src/metabase/query_builder/components/filters/pickers/NumberPicker.jsx
+++ b/frontend/src/metabase/query_builder/components/filters/pickers/NumberPicker.jsx
@@ -23,7 +23,13 @@ export default class NumberPicker extends Component<*, Props, State> {
     constructor(props: Props) {
         super(props);
         this.state = {
-            stringValues: props.values.map(v => String(v || "")),
+            stringValues: props.values.map(v => {
+                if(typeof v === 'number') {
+                    return String(v)
+                } else {
+                    return String(v || "")
+                }
+            }),
             validations: this._validate(props.values)
         }
     }