diff --git a/packages/desktop-client/src/components/accounts/Filters.js b/packages/desktop-client/src/components/accounts/Filters.js
index b0a552258c5cb2f82ed591f23fd2d104b826e57a..036642186bf8f92e79a1793498e13f3b92d2d014 100644
--- a/packages/desktop-client/src/components/accounts/Filters.js
+++ b/packages/desktop-client/src/components/accounts/Filters.js
@@ -244,7 +244,7 @@ function ConfigureField({
               field={field}
               subfield={subfield}
               type={type === 'id' && op === 'contains' ? 'string' : type}
-              value={value}
+              value={normalizeValue(value, op === 'oneOf')}
               multi={op === 'oneOf'}
               style={{ marginTop: 10 }}
               onChange={v => dispatch({ type: 'set-value', value: v })}
@@ -530,3 +530,18 @@ export function AppliedFilters({ filters, editingFilter, onUpdate, onDelete }) {
     </View>
   );
 }
+
+function normalizeValue(value, isMulti) {
+  if (isMulti) {
+    if (Array.isArray(value)) {
+      return value;
+    }
+    return value.split(', ');
+  }
+
+  if (Array.isArray(value)) {
+    return value.join(', ');
+  }
+
+  return value;
+}
diff --git a/upcoming-release-notes/855.md b/upcoming-release-notes/855.md
new file mode 100644
index 0000000000000000000000000000000000000000..3207fe87cad80c0d5c9b2760008786114e297250
--- /dev/null
+++ b/upcoming-release-notes/855.md
@@ -0,0 +1,6 @@
+---
+category: Bugfix
+authors: [MatissJanis]
+---
+
+Normalize value when single/multi select is changed