diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java
index 3d0225d4fe62f76b17ab81d58c24bc976ecfd0dc..453f0c2b11d353790869f11033e1b6e917191a17 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java
@@ -1098,7 +1098,7 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio
         savedInstanceState.putLong("mainFilter", mainFilter);
         savedInstanceState.putSerializable("selectedTag", selectedTag);
         savedInstanceState = binding.drawer.saveInstanceState(savedInstanceState);
-        savedInstanceState = accountHeader.saveInstanceState(savedInstanceState);
+        if (accountHeader != null) savedInstanceState = accountHeader.saveInstanceState(savedInstanceState);
         super.onSaveInstanceState(savedInstanceState);
     }