diff --git a/app/src/main/java/eu/faircode/email/EmailProvider.java b/app/src/main/java/eu/faircode/email/EmailProvider.java
index e982889e63..fcf85a181e 100644
--- a/app/src/main/java/eu/faircode/email/EmailProvider.java
+++ b/app/src/main/java/eu/faircode/email/EmailProvider.java
@@ -322,9 +322,10 @@ public class EmailProvider implements Parcelable {
     }
 
     static EmailProvider getProvider(Context context, String id) throws FileNotFoundException {
-        for (EmailProvider provider : loadProfiles(context))
-            if (id.equals(provider.id))
-                return provider;
+        if (id != null)
+            for (EmailProvider provider : loadProfiles(context))
+                if (id.equals(provider.id))
+                    return provider;
 
         throw new FileNotFoundException("provider id=" + id);
     }