diff --git a/pgpainless-core/src/main/java/org/pgpainless/decryption_verification/OpenPgpMessageInputStream.java b/pgpainless-core/src/main/java/org/pgpainless/decryption_verification/OpenPgpMessageInputStream.java
index 28440257..65c8dad5 100644
--- a/pgpainless-core/src/main/java/org/pgpainless/decryption_verification/OpenPgpMessageInputStream.java
+++ b/pgpainless-core/src/main/java/org/pgpainless/decryption_verification/OpenPgpMessageInputStream.java
@@ -1018,11 +1018,9 @@ public class OpenPgpMessageInputStream extends DecryptionStream {
         }
 
         private PGPPublicKeyRing findCertificate(long keyId) {
-            for (PGPPublicKeyRing cert : options.getCertificates()) {
-                PGPPublicKey verificationKey = cert.getPublicKey(keyId);
-                if (verificationKey != null) {
-                    return cert;
-                }
+            PGPPublicKeyRing cert = options.getCertificateSource().getCertificate(keyId);
+            if (cert != null) {
+                return cert;
             }
 
             if (options.getMissingCertificateCallback() != null) {