diff --git a/src/main/java/eu/siacs/conversations/entities/Message.java b/src/main/java/eu/siacs/conversations/entities/Message.java
index 956c5724454a12994f227ec5967e368c96e817a5..362fc9338ddf933305d39db41191f91cf5688eb1 100644
--- a/src/main/java/eu/siacs/conversations/entities/Message.java
+++ b/src/main/java/eu/siacs/conversations/entities/Message.java
@@ -531,9 +531,6 @@ public class Message extends AbstractEntity implements AvatarService.Avatarable
     }
 
     public synchronized void setBody(String body) {
-        if (body == null) {
-            throw new Error("You should not set the message body to null");
-        }
         this.body = body;
         this.isGeoUri = null;
         this.isEmojisOnly = null;
diff --git a/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java b/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java
index 600136144dbca544fa4527d3c7b9078191f12f68..59a15573ebacb6dfcd56a462691ec7cb5e46cbc4 100644
--- a/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java
+++ b/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java
@@ -120,7 +120,7 @@ public class MessageGenerator extends AbstractGenerator {
 
             packet.addChild("x", Namespace.OOB).addChild("url").setContent(fileParams.url);
         }
-        packet.setBody(message.getQuoteableBody());
+        if (message.getQuoteableBody() != null) packet.setBody(message.getQuoteableBody());
         return packet;
     }
 
diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index 24db5abfcfacb723838fcca526792963890db62c..15dbbb284fa78c712c468e87f861c3ad9ba5f5cd 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -1636,7 +1636,7 @@ public class XmppConnectionService extends Service {
         }
 
         MessagePacket packet = null;
-        final boolean addToConversation = !message.edited();
+        final boolean addToConversation = !message.edited() && message.getQuoteableBody() != null;
         boolean saveInDb = addToConversation;
         message.setStatus(Message.STATUS_WAITING);