diff --git a/app/src/main/java/eu/faircode/email/EmailService.java b/app/src/main/java/eu/faircode/email/EmailService.java
index cdb019e5a1..4791b15fa8 100644
--- a/app/src/main/java/eu/faircode/email/EmailService.java
+++ b/app/src/main/java/eu/faircode/email/EmailService.java
@@ -938,6 +938,8 @@ public class EmailService implements AutoCloseable {
 
         String getFingerPrintSelect() {
             try {
+                if (certificate == null)
+                    return null;
                 String keyId = getKeyId(certificate);
                 String fingerPrint = getFingerPrint(certificate);
                 return fingerPrint + (keyId == null ? "" : "/" + keyId);