diff --git a/app/src/main/java/eu/faircode/email/ViewModelMessages.java b/app/src/main/java/eu/faircode/email/ViewModelMessages.java
index 8ac800f76e..7a8549f0bd 100644
--- a/app/src/main/java/eu/faircode/email/ViewModelMessages.java
+++ b/app/src/main/java/eu/faircode/email/ViewModelMessages.java
@@ -625,8 +625,10 @@ public class ViewModelMessages extends ViewModel {
                 owner.getLifecycle().addObserver(new LifecycleObserver() {
                     @OnLifecycleEvent(Lifecycle.Event.ON_DESTROY)
                     public void onDestroyed() {
-                        boundary.destroy(state);
-                        boundary = null;
+                        if (boundary != null) {
+                            boundary.destroy(state);
+                            boundary = null;
+                        }
                         owner.getLifecycle().removeObserver(this);
                     }
                 });