diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index f4e6f456c..c4048a3bd 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -3506,7 +3506,8 @@ public class XmppConnectionService extends Service {
 					mucServers.add(server);
 				}
 				for(Bookmark bookmark : account.getBookmarks()) {
-					final String s = bookmark.getJid().getDomainpart();
+					final Jid jid = bookmark.getJid();
+					final String s = jid == null ? null : jid.getDomainpart();
 					if (s != null && !mucServers.contains(s)) {
 						mucServers.add(s);
 					}