diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceEnvelope.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceEnvelope.java
index 4a8106f221..453aa44fdc 100644
--- a/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceEnvelope.java
+++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceEnvelope.java
@@ -331,6 +331,6 @@ public class SignalServiceEnvelope {
                                      proto.getDestinationUuid(),
                                      proto.getUrgent(),
                                      proto.getStory(),
-                                     proto.getReportingToken().toByteArray());
+                                     proto.hasReportingToken() ? proto.getReportingToken().toByteArray() : null);
   }
 }