diff --git a/app/src/main/java/eu/faircode/email/FragmentAccount.java b/app/src/main/java/eu/faircode/email/FragmentAccount.java
index 392446b8..0b63c140 100644
--- a/app/src/main/java/eu/faircode/email/FragmentAccount.java
+++ b/app/src/main/java/eu/faircode/email/FragmentAccount.java
@@ -448,6 +448,9 @@ public class FragmentAccount extends FragmentEx {
                                 else
                                     account.id = db.account().insertAccount(account);
 
+                                if (!synchronize)
+                                    db.account().setAccountError(account.id, null);
+
                                 List<EntityFolder> folders = new ArrayList<>();
 
                                 EntityFolder inbox = new EntityFolder();
diff --git a/app/src/main/java/eu/faircode/email/FragmentFolder.java b/app/src/main/java/eu/faircode/email/FragmentFolder.java
index 748b663a..094f1d04 100644
--- a/app/src/main/java/eu/faircode/email/FragmentFolder.java
+++ b/app/src/main/java/eu/faircode/email/FragmentFolder.java
@@ -89,6 +89,8 @@ public class FragmentFolder extends FragmentEx {
                                 db.beginTransaction();
 
                                 db.folder().setFolderProperties(id, synchronize, days);
+                                if (!synchronize)
+                                    db.folder().setFolderError(id, null);
 
                                 EntityFolder folder = db.folder().getFolder(id);
                                 if (!folder.synchronize)