diff --git a/src/main/java/eu/siacs/conversations/xml/LocalizedContent.java b/src/main/java/eu/siacs/conversations/xml/LocalizedContent.java
index 57a2f3dba521a34cda29b0f4170e9d51a798cfc6..fac5099a70f8efed7c8c0b73bbefb6ffbf5d4638 100644
--- a/src/main/java/eu/siacs/conversations/xml/LocalizedContent.java
+++ b/src/main/java/eu/siacs/conversations/xml/LocalizedContent.java
@@ -29,8 +29,8 @@ public class LocalizedContent {
                 final String childLanguage = child.getAttribute("xml:lang");
                 final String lang = childLanguage == null ? parentLanguage : childLanguage;
                 final String content = child.getContent();
-                if (content != null && (namespace == null || "jabber:client".equals(namespace))) {
-                    if (contents.put(lang, content) != null) {
+                if (namespace == null || "jabber:client".equals(namespace)) {
+                    if (contents.put(lang, content == null ? "" : content) != null) {
                         //anything that has multiple contents for the same language is invalid
                         return null;
                     }