diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/RecipientTable.kt b/app/src/main/java/org/thoughtcrime/securesms/database/RecipientTable.kt
index 7bed3d7645..d8c9b95491 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/RecipientTable.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/RecipientTable.kt
@@ -4298,6 +4298,8 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
           rotateStorageId(id)
         }
       }
+
+      pendingRecipients.forEach { id -> rotateStorageId(id) }
     }
 
     private fun clearSystemDataForPendingInfo() {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/migrations/ApplicationMigrations.java b/app/src/main/java/org/thoughtcrime/securesms/migrations/ApplicationMigrations.java
index d15205ebff..e033b2532b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/migrations/ApplicationMigrations.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/migrations/ApplicationMigrations.java
@@ -119,9 +119,10 @@ public class ApplicationMigrations {
     static final int REACTION_DATABASE_MIGRATION   = 75;
     static final int REBUILD_MESSAGE_FTS_INDEX_2   = 76;
     static final int GLIDE_CACHE_CLEAR             = 77;
+    static final int SYSTEM_NAME_RESYNC            = 78;
   }
 
-  public static final int CURRENT_VERSION = 77;
+  public static final int CURRENT_VERSION = 78;
 
   /**
    * This *must* be called after the {@link JobManager} has been instantiated, but *before* the call
@@ -531,6 +532,10 @@ public class ApplicationMigrations {
       jobs.put(Version.GLIDE_CACHE_CLEAR, new ClearGlideCacheMigrationJob());
     }
 
+    if (lastSeenVersion < Version.SYSTEM_NAME_RESYNC) {
+      jobs.put(Version.SYSTEM_NAME_RESYNC, new StorageServiceSystemNameMigrationJob());
+    }
+
     return jobs;
   }