1 files changed, 1 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 833b1eb3b..2d4ab926d 100644
--- a/src/main/java/de/pixart/messenger/entities/Conversation.java
+++ b/src/main/java/de/pixart/messenger/entities/Conversation.java
@@ -886,7 +886,7 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
     public boolean setAttribute(String key, String value) {
         synchronized (this.attributes) {
             try {
-                this.attributes.put(key, value);
+                this.attributes.put(key, value == null ? "" : value);
                 return true;
             } catch (JSONException e) {
                 return false;