diff --git a/superset-frontend/src/explore/controlUtils/getControlValuesCompatibleWithDatasource.ts b/superset-frontend/src/explore/controlUtils/getControlValuesCompatibleWithDatasource.ts
index 346768557c9dd..98590e63ee49b 100644
--- a/superset-frontend/src/explore/controlUtils/getControlValuesCompatibleWithDatasource.ts
+++ b/superset-frontend/src/explore/controlUtils/getControlValuesCompatibleWithDatasource.ts
@@ -36,11 +36,12 @@ const isControlValueCompatibleWithDatasource = (
 ) => {
   if (controlState.options && typeof value === 'string') {
     if (
-      (Array.isArray(controlState.options) &&
-        controlState.options.some(
-          (option: [string | number, string]) => option[0] === value,
-        )) ||
-      value in controlState.options
+      controlState.options.some(
+        (option: [string | number, string] | { column_name: string }) =>
+          Array.isArray(option)
+            ? option[0] === value
+            : option.column_name === value,
+      )
     ) {
       return datasource.columns.some(column => column.column_name === value);
     }