diff --git a/app/src/main/java/eu/faircode/email/ActivityMain.java b/app/src/main/java/eu/faircode/email/ActivityMain.java
index 1a24179813..d271492fb2 100644
--- a/app/src/main/java/eu/faircode/email/ActivityMain.java
+++ b/app/src/main/java/eu/faircode/email/ActivityMain.java
@@ -81,11 +81,9 @@ public class ActivityMain extends ActivityBase implements FragmentManager.OnBack
 
                 @Override
                 protected void onExecuted(Bundle args, Boolean hasAccounts) {
-                    if (hasAccounts) {
+                    if (hasAccounts)
                         startActivity(new Intent(ActivityMain.this, ActivityView.class));
-                        ServiceSynchronize.init(ActivityMain.this);
-                        ServiceSend.boot(ActivityMain.this);
-                    } else
+                    else
                         startActivity(new Intent(ActivityMain.this, ActivitySetup.class));
                     finish();
                 }
diff --git a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
index 23bc5702d4..fee4963651 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
@@ -1446,7 +1446,9 @@ public class ServiceSynchronize extends ServiceBase {
                     int pollInterval = prefs.getInt("poll_interval", 0);
                     int accounts = db.account().getSynchronizingAccounts().size();
                     if (enabled && pollInterval == 0 && accounts > 0)
-                        init(context);
+                        ContextCompat.startForegroundService(context,
+                                new Intent(context, ServiceSynchronize.class)
+                                        .setAction("init"));
                     else {
                         for (EntityAccount account : db.account().getAccounts())
                             db.account().setAccountState(account.id, null);
@@ -1465,12 +1467,6 @@ public class ServiceSynchronize extends ServiceBase {
         thread.start();
     }
 
-    static void init(Context context) {
-        ContextCompat.startForegroundService(context,
-                new Intent(context, ServiceSynchronize.class)
-                        .setAction("init"));
-    }
-
     private static void schedule(Context context) {
         Intent alarm = new Intent(context, ServiceSynchronize.class);
         alarm.setAction("alarm");