diff --git a/app/src/main/java/eu/faircode/email/TwoStateOwner.java b/app/src/main/java/eu/faircode/email/TwoStateOwner.java
index ced1615873..f13e7773f5 100644
--- a/app/src/main/java/eu/faircode/email/TwoStateOwner.java
+++ b/app/src/main/java/eu/faircode/email/TwoStateOwner.java
@@ -89,10 +89,11 @@ public class TwoStateOwner implements LifecycleOwner {
 
     void destroy() {
         Lifecycle.State state = registry.getCurrentState();
-        if (!state.equals(Lifecycle.State.CREATED))
-            setState(Lifecycle.State.CREATED);
-        if (!state.equals(Lifecycle.State.DESTROYED))
+        if (!state.equals(Lifecycle.State.DESTROYED)) {
+            if (!state.equals(Lifecycle.State.CREATED))
+                setState(Lifecycle.State.CREATED);
             setState(Lifecycle.State.DESTROYED);
+        }
     }
 
     @NonNull