diff --git a/src/main/java/eu/siacs/conversations/crypto/axolotl/XmppAxolotlSession.java b/src/main/java/eu/siacs/conversations/crypto/axolotl/XmppAxolotlSession.java
index b8d7dcbaf..d58b2dd8f 100644
--- a/src/main/java/eu/siacs/conversations/crypto/axolotl/XmppAxolotlSession.java
+++ b/src/main/java/eu/siacs/conversations/crypto/axolotl/XmppAxolotlSession.java
@@ -64,7 +64,8 @@ public class XmppAxolotlSession {
 	}
 
 	protected SQLiteAxolotlStore.Trust getTrust() {
-		return sqLiteAxolotlStore.getFingerprintTrust(fingerprint);
+		SQLiteAxolotlStore.Trust trust = sqLiteAxolotlStore.getFingerprintTrust(fingerprint);
+		return (trust == null)? SQLiteAxolotlStore.Trust.UNDECIDED : trust;
 	}
 
 	@Nullable