1 files changed, 5 insertions, 1 deletions
diff --git a/src/base/QXmppOmemoData.cpp b/src/base/QXmppOmemoData.cpp
index 6ab0a8d3..c19f9b88 100644
--- a/src/base/QXmppOmemoData.cpp
+++ b/src/base/QXmppOmemoData.cpp
@@ -768,7 +768,11 @@ void QXmppOmemoElement::toXml(QXmlStreamWriter *writer) const
 
     writer->writeEndElement();  // header
 
-    helperToXmlAddTextElement(writer, QStringLiteral("payload"), d->payload.toBase64());
+    // The payload element is only included if there is a payload.
+    // An empty OMEMO message does not contain a payload.
+    if (!d->payload.isEmpty()) {
+        writer->writeTextElement(QStringLiteral("payload"), d->payload.toBase64());
+    }
 
     writer->writeEndElement();  // encrypted
 }