diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index 810e0ec096bb55f925cd552040167ab747b928b5..83d5a4c2c99853dbe1e3b7c28ebdf75c87343242 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -1057,9 +1057,9 @@ public class XmppConnectionService extends Service {
 		int activeAccounts = 0;
 		for (final Account account : accounts) {
 			if (account.getStatus() != Account.State.DISABLED) {
+				databaseBackend.writeRoster(account.getRoster());
 				activeAccounts++;
 			}
-			databaseBackend.writeRoster(account.getRoster());
 			if (account.getXmppConnection() != null) {
 				new Thread(() -> disconnect(account, false)).start();
 			}