diff --git a/src/eu/siacs/conversations/entities/Bookmark.java b/src/eu/siacs/conversations/entities/Bookmark.java
index c4e151cb3eab8d6d35bd86edb24d04ea436932d7..38c034100559e083e9ff12decaa8c9f43d1251bd 100644
--- a/src/eu/siacs/conversations/entities/Bookmark.java
+++ b/src/eu/siacs/conversations/entities/Bookmark.java
@@ -122,4 +122,10 @@ public class Bookmark implements ListItem {
 		}
 		return element;
 	}
+
+	public void unregisterConversation() {
+		if (this.mJoinedConversation != null) {
+			this.mJoinedConversation.deregisterWithBookmark();
+		}
+	}
 }
diff --git a/src/eu/siacs/conversations/ui/StartConversation.java b/src/eu/siacs/conversations/ui/StartConversation.java
index da6c967bd7fb8b8c4821a04a0a3d1ae9d118a4c5..f23eb4202a9f7cf1dfca87f55325062bce732b0f 100644
--- a/src/eu/siacs/conversations/ui/StartConversation.java
+++ b/src/eu/siacs/conversations/ui/StartConversation.java
@@ -278,6 +278,7 @@ public class StartConversation extends XmppActivity {
 			
 			@Override
 			public void onClick(DialogInterface dialog, int which) {
+				bookmark.unregisterConversation();
 				Account account = bookmark.getAccount();
 				account.getBookmarks().remove(bookmark);
 				xmppConnectionService.pushBookmarks(account);