diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/ArchiveUploadProgress.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/ArchiveUploadProgress.kt
index ffd5686e42..cee5566ee2 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/ArchiveUploadProgress.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/ArchiveUploadProgress.kt
@@ -110,6 +110,10 @@ object ArchiveUploadProgress {
     updateState(PROGRESS_NONE)
   }
 
+  fun onMainBackupFileUploadFailure() {
+    updateState(PROGRESS_NONE)
+  }
+
   private fun updateState(state: ArchiveUploadProgressState, notify: Boolean = true) {
     uploadProgress = state
     SignalStore.backup.archiveUploadState = state
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/BackupMessagesJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/BackupMessagesJob.kt
index 0f06cc23c7..e42b32028e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/BackupMessagesJob.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/BackupMessagesJob.kt
@@ -93,6 +93,7 @@ class BackupMessagesJob private constructor(
     if (!isCanceled) {
       Log.w(TAG, "Failed to backup user messages. Marking failure state.")
       SignalStore.backup.markMessageBackupFailure()
+      ArchiveUploadProgress.onMainBackupFileUploadFailure()
     }
   }