diff --git a/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/OpenPgpContact.java b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/OpenPgpContact.java
index b7ffa0e71..eeff6705a 100644
--- a/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/OpenPgpContact.java
+++ b/smack-openpgp/src/main/java/org/jivesoftware/smackx/ox/OpenPgpContact.java
@@ -152,8 +152,11 @@ public class OpenPgpContact {
         while (iterator.hasNext()) {
             PGPPublicKeyRing ring = iterator.next();
             OpenPgpV4Fingerprint fingerprint = new OpenPgpV4Fingerprint(ring);
-            if (store.getTrust(getJid(), fingerprint) != trust) {
-                toRemove.add(ring);
+            if (trust == OpenPgpTrustStore.Trust.trusted) {
+                OpenPgpTrustStore.Trust fingerprintTrust = store.getTrust(getJid(), fingerprint);
+                if (fingerprintTrust != OpenPgpTrustStore.Trust.trusted && fingerprintTrust != OpenPgpTrustStore.Trust.ikey_trusted) {
+                    toRemove.add(ring);
+                }
             }
         }