diff --git a/app/src/main/java/eu/faircode/email/AdapterAccount.java b/app/src/main/java/eu/faircode/email/AdapterAccount.java
index 24fdc139e5..aef6928c11 100644
--- a/app/src/main/java/eu/faircode/email/AdapterAccount.java
+++ b/app/src/main/java/eu/faircode/email/AdapterAccount.java
@@ -159,7 +159,7 @@ public class AdapterAccount extends RecyclerView.Adapter<AdapterAccount.ViewHold
                 ivState.setImageResource(R.drawable.baseline_close_24);
             else
                 ivState.setImageResource(R.drawable.baseline_cloud_off_24);
-            ivState.setVisibility(account.synchronize ? View.VISIBLE : View.INVISIBLE);
+            ivState.setVisibility(account.synchronize || account.state != null ? View.VISIBLE : View.INVISIBLE);
 
             tvHost.setText(String.format("%s:%d", account.host, account.port));
             tvLast.setText(context.getString(R.string.title_last_connected,
diff --git a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
index 8a5c30397f..32bf49a72e 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
@@ -265,6 +265,7 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences
                                             " stop=" + prev.canRun() +
                                             " start=" + current.canRun() +
                                             " changed=" + !prev.accountState.equals(current.accountState) +
+                                            " enabled=" + current.accountState.synchronize +
                                             " state=" + current.accountState.state +
                                             " type=" + prev.networkState.getType() + "/" + current.networkState.getType());
                                 if (prev.canRun())
diff --git a/app/src/main/java/eu/faircode/email/TupleAccountState.java b/app/src/main/java/eu/faircode/email/TupleAccountState.java
index 902e131ae7..a5731fcce5 100644
--- a/app/src/main/java/eu/faircode/email/TupleAccountState.java
+++ b/app/src/main/java/eu/faircode/email/TupleAccountState.java
@@ -53,6 +53,6 @@ public class TupleAccountState extends EntityAccount {
     }
 
     boolean shouldRun(boolean enabled) {
-        return (isEnabled(enabled) || operations > 0);
+        return (isEnabled(enabled) || (operations > 0 && synchronize));
     }
 }