diff --git a/app/src/main/java/eu/faircode/email/SimpleTask.java b/app/src/main/java/eu/faircode/email/SimpleTask.java
index 1ee5ae3e35..873480a06d 100644
--- a/app/src/main/java/eu/faircode/email/SimpleTask.java
+++ b/app/src/main/java/eu/faircode/email/SimpleTask.java
@@ -171,7 +171,8 @@ public abstract class SimpleTask<T> implements LifecycleObserver {
                         Log.e(ex);
                     this.ex = ex;
                 } finally {
-                    wl.release();
+                    if (wl.isHeld())
+                        wl.release();
                 }
 
                 // Run on UI thread