diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/model/GroupsV2UpdateMessageProducer.java b/app/src/main/java/org/thoughtcrime/securesms/database/model/GroupsV2UpdateMessageProducer.java
index 6156a41fcf..d94174fcdb 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/model/GroupsV2UpdateMessageProducer.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/model/GroupsV2UpdateMessageProducer.java
@@ -871,7 +871,7 @@ final class GroupsV2UpdateMessageProducer {
 
     for (RecipientId recipientId : recipientIds) {
       String placeholder      = makePlaceholder(recipientId);
-      int    placeHolderStart = template.indexOf(placeholder);
+      int    placeHolderStart = template.indexOf(placeholder, startIndex);
       String beforeChunk      = template.substring(startIndex, placeHolderStart);
 
       builder.append(beforeChunk);