diff --git a/superset-frontend/src/explore/components/controls/SelectControl.jsx b/superset-frontend/src/explore/components/controls/SelectControl.jsx
index 2b032c531..16e1dc243 100644
--- a/superset-frontend/src/explore/components/controls/SelectControl.jsx
+++ b/superset-frontend/src/explore/components/controls/SelectControl.jsx
@@ -247,6 +247,7 @@ export default class SelectControl extends React.PureComponent {
       isMulti &&
       optionsRemaining &&
       Array.isArray(this.state.value) &&
+      Array.isArray(value) &&
       !!value.length
     ) {
       assistiveText = optionRemaingText;
diff --git a/superset-frontend/src/explore/components/controls/TextControl.tsx b/superset-frontend/src/explore/components/controls/TextControl.tsx
index 136b1f1dd..43c8c77d2 100644
--- a/superset-frontend/src/explore/components/controls/TextControl.tsx
+++ b/superset-frontend/src/explore/components/controls/TextControl.tsx
@@ -37,6 +37,7 @@ interface TextControlProps {
 
 interface TextControlState {
   controlId: string;
+  currentDatasource?: string;
   value?: string | number;
 }
 
@@ -55,8 +56,14 @@ export default class TextControl extends React.Component<
     props: TextControlProps,
     state: TextControlState,
   ) {
-    if (props.value !== state.value) {
-      return { value: props.value };
+    // reset value when datasource changes
+    // props.datasource and props.value don't update in the same re-render,
+    // so we need to synchronize them to update the state with correct values
+    if (
+      props.value !== state.value &&
+      props.datasource !== state.currentDatasource
+    ) {
+      return { value: props.value, currentDatasource: props.datasource };
     }
     return null;
   }
@@ -69,13 +76,10 @@ export default class TextControl extends React.Component<
     this.state = {
       controlId: generateControlId(props.controlId),
       value: props.value,
+      currentDatasource: props.datasource,
     };
   }
 
-  defaultInput = () => {
-    this.setState({ value: '' });
-  };
-
   onChange = (inputValue: string) => {
     let parsedValue: string | number = inputValue;
     // Validation & casting