diff --git a/app/src/main/java/org/thoughtcrime/securesms/storage/StorageSyncHelper.java b/app/src/main/java/org/thoughtcrime/securesms/storage/StorageSyncHelper.java
index 23cf903d6..1ebe8075e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/storage/StorageSyncHelper.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/storage/StorageSyncHelper.java
@@ -117,7 +117,17 @@ public final class StorageSyncHelper {
 
     for (RecipientSettings insert : inserts) {
       storageInserts.add(StorageSyncModels.localToRemoteRecord(insert, archivedRecipients));
-      completeIds.add(StorageId.forContact(insert.getStorageId()));
+
+      switch (insert.getGroupType()) {
+        case NONE:
+          completeIds.add(StorageId.forContact(insert.getStorageId()));
+          break;
+        case SIGNAL_V1:
+          completeIds.add(StorageId.forGroupV1(insert.getStorageId()));
+          break;
+        default:
+          throw new AssertionError("Unsupported type!");
+      }
     }
 
     if (accountInsert.isPresent()) {