diff --git a/app/src/main/java/eu/faircode/email/DaoAccount.java b/app/src/main/java/eu/faircode/email/DaoAccount.java
index 069353e11b..7bd2128f01 100644
--- a/app/src/main/java/eu/faircode/email/DaoAccount.java
+++ b/app/src/main/java/eu/faircode/email/DaoAccount.java
@@ -155,7 +155,8 @@ public interface DaoAccount {
 
     @Query("SELECT * FROM account" +
             " WHERE user = :user" +
-            " AND auth_type IN (:auth_type)")
+            " AND auth_type IN (:auth_type)" +
+            " AND tbd IS NULL")
     List<EntityAccount> getAccounts(String user, int[] auth_type);
 
     @Query("SELECT * FROM account WHERE `primary`")