1 files changed, 3 insertions, 0 deletions
diff --git a/src/main/java/de/pixart/messenger/entities/Conversation.java b/src/main/java/de/pixart/messenger/entities/Conversation.java
index b20976316..cc0d5525f 100644
--- a/src/main/java/de/pixart/messenger/entities/Conversation.java
+++ b/src/main/java/de/pixart/messenger/entities/Conversation.java
@@ -805,6 +805,9 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
         if (OmemoSetting.isAlways()) {
             return suitableForOmemoByDefault(this) ? Message.ENCRYPTION_AXOLOTL : Message.ENCRYPTION_NONE;
         }
+        if (OmemoSetting.isNever()) {
+            return Message.ENCRYPTION_NONE;
+        }
         final int defaultEncryption;
         if (suitableForOmemoByDefault(this)) {
             defaultEncryption = OmemoSetting.getEncryption();