diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceContent.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceContent.java
index 2104861f7d..6526e5ade6 100644
--- a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceContent.java
+++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceContent.java
@@ -316,7 +316,7 @@ public final class SignalServiceContent {
     return new SignalServiceDataMessage(metadata.getTimestamp(),
                                         groupInfoV1, groupInfoV2,
                                         attachments,
-                                        content.getBody(),
+                                        content.hasBody() ? content.getBody() : null,
                                         endSession,
                                         content.getExpireTimer(),
                                         expirationUpdate,