diff --git a/src/main/java/eu/siacs/conversations/ui/TrustKeysActivity.java b/src/main/java/eu/siacs/conversations/ui/TrustKeysActivity.java
index d33b867f9..22896f6be 100644
--- a/src/main/java/eu/siacs/conversations/ui/TrustKeysActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/TrustKeysActivity.java
@@ -333,9 +333,13 @@ public class TrustKeysActivity extends OmemoActivity implements OnKeyStatusUpdat
 				processFingerprintVerification(this.mPendingFingerprintVerificationUri);
 				this.mPendingFingerprintVerificationUri = null;
 			} else {
-				reloadFingerprints();
-				populateView();
-				invalidateOptionsMenu();
+				final boolean keysToTrust = reloadFingerprints();
+				if (keysToTrust || hasPendingKeyFetches() || hasNoOtherTrustedKeys()) {
+					populateView();
+					invalidateOptionsMenu();
+				} else {
+					finishOk(false);
+				}
 			}
 		}
 	}