diff --git a/app/src/main/java/eu/faircode/email/AdapterAccount.java b/app/src/main/java/eu/faircode/email/AdapterAccount.java
index 1d0783af03..52cac20fe0 100644
--- a/app/src/main/java/eu/faircode/email/AdapterAccount.java
+++ b/app/src/main/java/eu/faircode/email/AdapterAccount.java
@@ -381,6 +381,7 @@ public class AdapterAccount extends RecyclerView.Adapter<AdapterAccount.ViewHold
                                 if (!sync) {
                                     db.account().setAccountWarning(id, null);
                                     db.account().setAccountError(id, null);
+                                    db.account().setAccountConnected(id, null);
                                 }
 
                                 db.account().setAccountSynchronize(id, sync);
diff --git a/app/src/main/java/eu/faircode/email/DaoAccount.java b/app/src/main/java/eu/faircode/email/DaoAccount.java
index 81ff8e040b..c21a9ecab3 100644
--- a/app/src/main/java/eu/faircode/email/DaoAccount.java
+++ b/app/src/main/java/eu/faircode/email/DaoAccount.java
@@ -149,7 +149,7 @@ public interface DaoAccount {
     int setAccountPassword(long id, String password);
 
     @Query("UPDATE account SET last_connected = :last_connected WHERE id = :id AND NOT (last_connected IS :last_connected)")
-    int setAccountConnected(long id, long last_connected);
+    int setAccountConnected(long id, Long last_connected);
 
     @Query("UPDATE account SET backoff_until = :backoff_until WHERE id = :id AND NOT (backoff_until IS :backoff_until)")
     int setAccountBackoff(long id, Long backoff_until);