diff --git a/src/main/java/eu/siacs/conversations/entities/Conversation.java b/src/main/java/eu/siacs/conversations/entities/Conversation.java
index a04f8872e40ee073208e24737849b560d7f5ea3f..1f31e9213de177c592eaa7d281b3fd1405d231c2 100644
--- a/src/main/java/eu/siacs/conversations/entities/Conversation.java
+++ b/src/main/java/eu/siacs/conversations/entities/Conversation.java
@@ -2030,10 +2030,13 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
 
                     options = field.getOptions();
                     binding.list.setOnItemClickListener((parent, view, position, id) -> {
-                        Set<String> values = new HashSet<>(field.getValues());
-                        for (final String value : field.getValues()) {
-                            if (filteredValues.contains(value)) {
-                                values.remove(value);
+                        Set<String> values = new HashSet<>();
+                        if (multi) {
+                            values.addAll(field.getValues());
+                            for (final String value : field.getValues()) {
+                                if (filteredValues.contains(value)) {
+                                    values.remove(value);
+                                }
                             }
                         }