diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java
index 07238e929..8f138c00b 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java
@@ -1161,7 +1161,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);
     }