diff --git a/app/src/main/java/org/thoughtcrime/securesms/AppInitialization.java b/app/src/main/java/org/thoughtcrime/securesms/AppInitialization.java
index f269819ab0..468c63c8ad 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/AppInitialization.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/AppInitialization.java
@@ -5,6 +5,7 @@ import android.content.Context;
 import androidx.annotation.NonNull;
 
 import org.signal.core.util.logging.Log;
+import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.jobmanager.JobManager;
 import org.thoughtcrime.securesms.jobs.DeleteAbandonedAttachmentsJob;
@@ -14,6 +15,7 @@ import org.thoughtcrime.securesms.jobs.StickerPackDownloadJob;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.migrations.ApplicationMigrations;
 import org.thoughtcrime.securesms.migrations.QuoteThumbnailBackfillMigrationJob;
+import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.stickers.BlessedPacks;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.signal.core.util.Util;
@@ -59,6 +61,12 @@ public final class AppInitialization {
     EmojiSearchIndexDownloadJob.scheduleImmediately();
     DeleteAbandonedAttachmentsJob.enqueue();
 
+    RecipientId.clearCache();
+    SignalDatabase.remappedRecords().clearCache();
+    SignalDatabase.threads().clearCache();
+    AppDependencies.getRecipientCache().clear();
+    AppDependencies.getRecipientCache().clearSelf();
+
     if (SignalStore.misc().startedQuoteThumbnailMigration()) {
       AppDependencies.getJobManager().add(new QuoteThumbnailBackfillJob());
     } else {