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 453a1d9e30..76783f96fc 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
@@ -930,7 +930,7 @@ public final class SignalServiceContent {
       throw new ProtocolInvalidMessageException(new InvalidMessageException(e), null, 0);
     }
 
-    if (groupV2.hasGroupChange()) {
+    if (groupV2.hasGroupChange() && !groupV2.getGroupChange().isEmpty()) {
       builder.withSignedGroupChange(groupV2.getGroupChange().toByteArray());
     }