diff --git a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
index f76b1f284b..6041822848 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
@@ -678,8 +678,10 @@ public class ServiceSynchronize extends ServiceBase {
     private void stop() {
         EntityLog.log(this, "Main stop");
 
-        state.stop();
-        state.join();
+        if (state != null) {
+            state.stop();
+            state.join();
+        }
 
         EntityLog.log(this, "Main stopped");