diff --git a/src/eu/siacs/conversations/services/XmppConnectionService.java b/src/eu/siacs/conversations/services/XmppConnectionService.java
index ad522fd94..edd01ef39 100644
--- a/src/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/eu/siacs/conversations/services/XmppConnectionService.java
@@ -901,6 +901,16 @@ public class XmppConnectionService extends Service {
 	}
 
 	public void deleteAccount(Account account) {
+		for(Conversation conversation : conversations) {
+			if (conversation.getAccount() == account) {
+				if (conversation.getMode() == Conversation.MODE_MULTI) {
+					leaveMuc(conversation);
+				} else if (conversation.getMode() == Conversation.MODE_SINGLE) {
+					conversation.endOtrIfNeeded();
+				}
+				conversations.remove(conversation);
+			}
+		}
 		if (account.getXmppConnection() != null) {
 			this.disconnect(account, true);
 		}