diff --git a/superset/assets/javascripts/explorev2/components/controls/Filter.jsx b/superset/assets/javascripts/explorev2/components/controls/Filter.jsx
index 263b29f9e8..3397ded94b 100644
--- a/superset/assets/javascripts/explorev2/components/controls/Filter.jsx
+++ b/superset/assets/javascripts/explorev2/components/controls/Filter.jsx
@@ -97,8 +97,12 @@ export default class Filter extends React.Component {
         this.fetchFilterValues(filter.col);
       }
     }
+    // switching filter value between array/string when needed
     if (strFilterOps.indexOf(filter.op) !== -1) {
       // druid having filter or regex/==/!= filters
+      if (typeof filter.val !== 'string') {
+        this.props.changeFilter('val', filter.val.length > 0 ? filter.val[0] : '');
+      }
       return (
         <input
           type="text"
@@ -109,6 +113,9 @@ export default class Filter extends React.Component {
         />
       );
     }
+    if (typeof filter.val === 'string') {
+      this.props.changeFilter('val', filter.val === '' ? [] : [filter.val]);
+    }
     return (
       <SelectControl
         multi