diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListDataSource.java b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListDataSource.java
index fbebda87b..27f71043e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListDataSource.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListDataSource.java
@@ -68,6 +68,7 @@ abstract class ConversationListDataSource implements PagedDataSource<Long, Conve
       while ((record = reader.getNext()) != null && !cancellationSignal.isCanceled()) {
         conversations.add(new Conversation(record));
         recipients.add(record.getRecipient());
+        needsResolve.add(record.getGroupMessageSender());
 
         if (!record.getRecipient().isPushV2Group()) {
           needsResolve.add(record.getRecipient().getId());