diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/BackupRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/BackupRepository.kt
index cd4133a3c0..473812b58d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/BackupRepository.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/BackupRepository.kt
@@ -1286,6 +1286,7 @@ object BackupRepository {
       }
 
       RecipientId.clearCache()
+      SignalDatabase.remappedRecords.clearCache()
       AppDependencies.recipientCache.clear()
       AppDependencies.recipientCache.clearSelf()
       SignalDatabase.threads.clearCache()
@@ -1428,6 +1429,7 @@ object BackupRepository {
       SignalDatabase.rawDatabase.forceForeignKeyConstraintsEnabled(true)
     }
 
+    SignalDatabase.remappedRecords.clearCache()
     AppDependencies.recipientCache.clear()
     AppDependencies.recipientCache.warmUp()
     SignalDatabase.threads.clearCache()
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/RemappedRecordTables.kt b/app/src/main/java/org/thoughtcrime/securesms/database/RemappedRecordTables.kt
index 1eb4bc806c..4b765802fe 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/RemappedRecordTables.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/RemappedRecordTables.kt
@@ -112,6 +112,10 @@ class RemappedRecordTables internal constructor(context: Context?, databaseHelpe
       .run()
   }
 
+  fun clearCache() {
+    RemappedRecords.getInstance().resetCache()
+  }
+
   private fun trimInvalidRecipientEntries(db: SQLiteDatabase) {
     val count = db.delete(Recipients.TABLE_NAME)
       .where("$OLD_ID IN (SELECT $ID FROM ${RecipientTable.TABLE_NAME})")