1 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/de/pixart/messenger/entities/Conversation.java b/src/main/java/de/pixart/messenger/entities/Conversation.java
index 8104e5ab1..b3e92fba2 100644
--- a/src/main/java/de/pixart/messenger/entities/Conversation.java
+++ b/src/main/java/de/pixart/messenger/entities/Conversation.java
@@ -639,7 +639,9 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
         values.put(CREATED, created);
         values.put(STATUS, status);
         values.put(MODE, mode);
-        values.put(ATTRIBUTES, attributes.toString());
+        synchronized (this.attributes) {
+            values.put(ATTRIBUTES, attributes.toString());
+        }
         return values;
     }