diff --git a/src/main/java/de/monocles/chat/WebxdcUpdate.java b/src/main/java/de/monocles/chat/WebxdcUpdate.java
index 97db383ab..8aaddba9f 100644
--- a/src/main/java/de/monocles/chat/WebxdcUpdate.java
+++ b/src/main/java/de/monocles/chat/WebxdcUpdate.java
@@ -16,8 +16,8 @@ public class WebxdcUpdate {
     protected final String conversationId;
     protected final String messageId;
     protected final Jid sender;
-    protected final String thread;
-    protected final String threadParent;
+    protected String thread;
+    protected String threadParent;
     protected final String info;
     protected final String document;
     protected final String summary;
@@ -29,8 +29,13 @@ public class WebxdcUpdate {
         this.conversationId = conversation.getUuid();
         this.messageId = messageId;
         this.sender = sender;
-        this.thread = thread.getContent();
-        this.threadParent = thread.getAttribute("parent");
+        if (thread != null ) {
+            this.thread = thread.getContent();
+            this.threadParent = thread.getAttribute("parent");
+        } else {
+            this.thread = "thread";
+            this.threadParent = "parent";
+        }
         this.info = info;
         this.document = document;
         this.summary = summary;