diff --git a/core/core-frontend/src/components/visualization/OuterParamsSet.vue b/core/core-frontend/src/components/visualization/OuterParamsSet.vue
index 9bd069df17..0721c1be0b 100644
--- a/core/core-frontend/src/components/visualization/OuterParamsSet.vue
+++ b/core/core-frontend/src/components/visualization/OuterParamsSet.vue
@@ -474,9 +474,13 @@ const state = reactive({
 const matchModeChange = baseFilter => {
   if (
     baseFilter.matchMode === 'filter' &&
-    !['0', '9', '2'].includes(baseFilter.filterSelected + '')
+    baseFilter.propValue &&
+    baseFilter.propValue.length > 0
   ) {
-    baseFilter.filterSelected = undefined
+    const matchedItem = baseFilter.propValue.find(item => item.id === baseFilter.filterSelected)
+    if (matchedItem && !['0', '9', '2'].includes(matchedItem.displayType.toString())) {
+      baseFilter.filterSelected = undefined
+    }
   }
 }