diff --git a/src/main/java/eu/siacs/conversations/entities/Conversation.java b/src/main/java/eu/siacs/conversations/entities/Conversation.java
index 646bc2bee..9d814046a 100644
--- a/src/main/java/eu/siacs/conversations/entities/Conversation.java
+++ b/src/main/java/eu/siacs/conversations/entities/Conversation.java
@@ -683,6 +683,7 @@ public class Conversation extends AbstractEntity implements Blockable {
 					&& axolotlService != null
 					&& mode == MODE_SINGLE
 					&& axolotlService.isConversationAxolotlCapable(this)
+					&& getAccount().getSelfContact().getPresences().allOrNonSupport(AxolotlService.PEP_DEVICE_LIST_NOTIFY)
 					&& getContact().getPresences().allOrNonSupport(AxolotlService.PEP_DEVICE_LIST_NOTIFY)) {
 				return Message.ENCRYPTION_AXOLOTL;
 			}