diff --git a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
index 6e6bd7d947..af1732bfaa 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
@@ -1726,7 +1726,7 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences
 
             long[] schedule = getSchedule(ServiceSynchronize.this);
             long now = new Date().getTime();
-            boolean scheduled = (schedule == null || now >= schedule[0] && now < schedule[1]);
+            boolean scheduled = (schedule == null || (now >= schedule[0] && now < schedule[1]));
 
             if (command == null) {
                 command = new Bundle();
@@ -1807,7 +1807,7 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences
         boolean enabled;
         long[] schedule = getSchedule(context);
         if (schedule == null)
-            enabled = true;
+            enabled = false;
         else {
             long now = new Date().getTime();
             long next = (now < schedule[0] ? schedule[0] : schedule[1]);
@@ -1827,7 +1827,10 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences
 
     static long[] getSchedule(Context context) {
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-        if (!prefs.getBoolean("schedule", false))
+        boolean enabled = prefs.getBoolean("enabled", true);
+        boolean schedule = prefs.getBoolean("schedule", false);
+
+        if (!enabled || !schedule)
             return null;
 
         if (!ActivityBilling.isPro(context))
diff --git a/app/src/main/java/eu/faircode/email/ServiceUI.java b/app/src/main/java/eu/faircode/email/ServiceUI.java
index 5c15dc3d3b..5c163fb8a7 100644
--- a/app/src/main/java/eu/faircode/email/ServiceUI.java
+++ b/app/src/main/java/eu/faircode/email/ServiceUI.java
@@ -468,7 +468,7 @@ public class ServiceUI extends IntentService {
         if (reschedule) {
             long now = new Date().getTime();
             long[] schedule = ServiceSynchronize.getSchedule(this);
-            boolean enabled = (schedule == null || (now >= schedule[0] && now < schedule[1]));
+            boolean enabled = (schedule != null && now >= schedule[0] && now < schedule[1]);
             schedule(this, enabled);
         }
     }