diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/LocalArchiveJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/LocalArchiveJob.kt
index bcbd8d72a2..5ac591f99e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/LocalArchiveJob.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/LocalArchiveJob.kt
@@ -91,6 +91,7 @@ class LocalArchiveJob internal constructor(parameters: Parameters) : Job(paramet
       stopwatch.split("create-snapshot")
 
       try {
+        SignalDatabase.attachments.createRemoteKeyForAttachmentsThatNeedArchiveUpload()
         SignalDatabase.attachmentMetadata.insertNewKeysForExistingAttachments()
 
         val progressScope = CoroutineScope(SupervisorJob() + Dispatchers.Default)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/LocalPlaintextArchiveJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/LocalPlaintextArchiveJob.kt
index 6f143f6677..ae5d8fed9e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/LocalPlaintextArchiveJob.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/LocalPlaintextArchiveJob.kt
@@ -108,6 +108,7 @@ class LocalPlaintextArchiveJob internal constructor(
       stopwatch.split("create-dir")
 
       try {
+        SignalDatabase.attachments.createRemoteKeyForAttachmentsThatNeedArchiveUpload()
         SignalDatabase.attachmentMetadata.insertNewKeysForExistingAttachments()
 
         val progressScope = CoroutineScope(SupervisorJob() + Dispatchers.Default)