diff --git a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
index 95ef965965..8dc7199d36 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
@@ -1598,7 +1598,6 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences
                 } finally {
                     // Update state
                     EntityLog.log(this, account.name + " closing");
-                    db.account().setAccountState(account.id, "closing");
 
                     // Stop watching operations
                     Log.i(account.name + " stop watching operations");
@@ -1631,6 +1630,7 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences
 
                     // Close store
                     try {
+                        db.account().setAccountState(account.id, "closing");
                         EntityLog.log(this, account.name + " store closing");
                         iservice.close();
                         EntityLog.log(this, account.name + " store closed");