diff --git a/app/src/main/java/eu/faircode/email/EmailProvider.java b/app/src/main/java/eu/faircode/email/EmailProvider.java
index 9cebfc0c09..678edf50d2 100644
--- a/app/src/main/java/eu/faircode/email/EmailProvider.java
+++ b/app/src/main/java/eu/faircode/email/EmailProvider.java
@@ -194,7 +194,8 @@ public class EmailProvider {
             }
 
         // https://docs.aws.amazon.com/workmail/latest/userguide/using_IMAP_client.html
-        if (autoconfig.imap.host.endsWith(".awsapps.com"))
+        if (autoconfig.imap.host != null &&
+                autoconfig.imap.host.endsWith(".awsapps.com"))
             autoconfig.partial = false;
 
         return autoconfig;