diff --git a/src/main/java/eu/siacs/conversations/entities/Conversation.java b/src/main/java/eu/siacs/conversations/entities/Conversation.java
index 962ad13b3..7793cc23b 100644
--- a/src/main/java/eu/siacs/conversations/entities/Conversation.java
+++ b/src/main/java/eu/siacs/conversations/entities/Conversation.java
@@ -609,15 +609,15 @@ public class Conversation extends AbstractEntity implements Blockable {
 
 	public int getNextEncryption() {
 		final AxolotlService axolotlService = getAccount().getAxolotlService();
-		if (Config.X509_VERIFICATION && mode == MODE_SINGLE) {
-			if (axolotlService != null && axolotlService.isContactAxolotlCapable(getContact())) {
-				return Message.ENCRYPTION_AXOLOTL;
-			} else {
-				return Message.ENCRYPTION_NONE;
-			}
-		}
 		int next = this.getIntAttribute(ATTRIBUTE_NEXT_ENCRYPTION, -1);
 		if (next == -1) {
+			if (Config.X509_VERIFICATION && mode == MODE_SINGLE) {
+				if (axolotlService != null && axolotlService.isContactAxolotlCapable(getContact())) {
+					return Message.ENCRYPTION_AXOLOTL;
+				} else {
+					return Message.ENCRYPTION_NONE;
+				}
+			}
 			int outgoing = this.getMostRecentlyUsedOutgoingEncryption();
 			if (outgoing == Message.ENCRYPTION_NONE) {
 				next = this.getMostRecentlyUsedIncomingEncryption();