diff --git a/src/main/java/eu/siacs/conversations/entities/Conversation.java b/src/main/java/eu/siacs/conversations/entities/Conversation.java
index 66ff9c4e1371654be97a7a344adc5ec302516798..2e8fe4ba824d6028437e79a2d73857c59a678243 100644
--- a/src/main/java/eu/siacs/conversations/entities/Conversation.java
+++ b/src/main/java/eu/siacs/conversations/entities/Conversation.java
@@ -1946,6 +1946,10 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
                             break;
                         }
                     }
+                    if (defaultOption == null && !mValue.getContent().equals("")) {
+                        // Synthesize default option for custom value
+                        defaultOption = new Option(mValue.getContent(), mValue.getContent());
+                    }
                     if (defaultOption == null) {
                         binding.defaultButton.setVisibility(View.GONE);
                     } else {