diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index 3cec4a4959ac16f1bfff345cd43b6bd219629653..dc644833a0457081bcd06bfb2e1ee4645a97d167 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -2468,6 +2468,11 @@ public class XmppConnectionService extends Service {
                     mNotificationService.clear(conversation);
                 }
             }
+            new Thread(() -> {
+                for (final Contact contact : account.getRoster().getContacts()) {
+                    contact.unregisterAsPhoneAccount(this);
+                }
+            }).start();
             if (account.getXmppConnection() != null) {
                 new Thread(() -> disconnect(account, !connected)).start();
             }