diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationsOverviewFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationsOverviewFragment.java
index bc3667332ddcf9f7781c937ce001fe609a59b93a..17238738811593961c5badc9fa89af460d92a951 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationsOverviewFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationsOverviewFragment.java
@@ -387,11 +387,6 @@ public class ConversationsOverviewFragment extends XmppFragment {
 	@Override
 	public void onBackendConnected() {
 		refresh();
-		if (activity.xmppConnectionService.isOnboarding()) {
-			binding.fab.setVisibility(View.GONE);
-		} else {
-			binding.fab.setVisibility(View.VISIBLE);
-		}
 	}
 
 	@Override
@@ -491,6 +486,12 @@ public class ConversationsOverviewFragment extends XmppFragment {
 		if (scrollState != null) {
 			setScrollPosition(scrollState);
 		}
+
+		if (activity.xmppConnectionService != null && activity.xmppConnectionService.isOnboarding()) {
+			binding.fab.setVisibility(View.GONE);
+		} else {
+			binding.fab.setVisibility(View.VISIBLE);
+		}
 	}
 
 	private void setScrollPosition(ScrollState scrollPosition) {