diff --git a/src/main/java/eu/siacs/conversations/entities/Conversation.java b/src/main/java/eu/siacs/conversations/entities/Conversation.java
index c920481fca33b01246be5176060d80df3fa587a3..2e10bc2edd543ec3f23573e9eda7f9953cea1b9a 100644
--- a/src/main/java/eu/siacs/conversations/entities/Conversation.java
+++ b/src/main/java/eu/siacs/conversations/entities/Conversation.java
@@ -2382,9 +2382,10 @@ public class Conversation extends AbstractEntity
                     binding.list.setOnItemClickListener((parent, view, position, id) -> {
                         Set<String> values = new HashSet<>();
                         if (multi) {
+                            final var optionValues = options.stream().map(o -> o.getValue()).collect(Collectors.toSet());
                             values.addAll(field.getValues());
                             for (final String value : field.getValues()) {
-                                if (filteredValues.contains(value)) {
+                                if (filteredValues.contains(value) || (!open && !optionValues.contains(value))) {
                                     values.remove(value);
                                 }
                             }