diff --git a/app/src/main/java/eu/faircode/email/FragmentAccount.java b/app/src/main/java/eu/faircode/email/FragmentAccount.java
index ec1d6cb148..880b763174 100644
--- a/app/src/main/java/eu/faircode/email/FragmentAccount.java
+++ b/app/src/main/java/eu/faircode/email/FragmentAccount.java
@@ -840,8 +840,11 @@ public class FragmentAccount extends FragmentEx {
                                     @Override
                                     protected Void onLoad(Context context, Bundle args) {
                                         long id = args.getLong("id");
-                                        DB.getInstance(context).account().deleteAccount(id);
-                                        ServiceSynchronize.reload(getContext(), "delete account");
+                                        DB db = DB.getInstance(context);
+                                        EntityAccount account = db.account().getAccount(id);
+                                        db.account().deleteAccount(id);
+                                        if (account.synchronize)
+                                            ServiceSynchronize.reload(getContext(), "delete account");
                                         return null;
                                     }
 
diff --git a/app/src/main/java/eu/faircode/email/FragmentIdentity.java b/app/src/main/java/eu/faircode/email/FragmentIdentity.java
index 1b1589886d..964ff656ad 100644
--- a/app/src/main/java/eu/faircode/email/FragmentIdentity.java
+++ b/app/src/main/java/eu/faircode/email/FragmentIdentity.java
@@ -521,8 +521,11 @@ public class FragmentIdentity extends FragmentEx {
                                     @Override
                                     protected Void onLoad(Context context, Bundle args) {
                                         long id = args.getLong("id");
-                                        DB.getInstance(context).identity().deleteIdentity(id);
-                                        ServiceSynchronize.reload(getContext(), "delete identity");
+                                        DB db = DB.getInstance(context);
+                                        EntityIdentity identity = db.identity().getIdentity(id);
+                                        db.identity().deleteIdentity(id);
+                                        if (identity.synchronize)
+                                            ServiceSynchronize.reload(getContext(), "delete identity");
                                         return null;
                                     }