diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/AttachmentTable.kt b/app/src/main/java/org/thoughtcrime/securesms/database/AttachmentTable.kt
index 21160cc79f..8a52ef9fe1 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/AttachmentTable.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/AttachmentTable.kt
@@ -860,7 +860,7 @@ class AttachmentTable(
       .where(
         """
         $ARCHIVE_TRANSFER_STATE = ${ArchiveTransferState.FINISHED.value} AND 
-        $ARCHIVE_THUMBNAIL_TRANSFER_STATE = ${ArchiveTransferState.NONE.value} AND
+        $ARCHIVE_THUMBNAIL_TRANSFER_STATE IN (${ArchiveTransferState.NONE.value}, ${ArchiveTransferState.TEMPORARY_FAILURE.value}) AND
         $QUOTE = 0 AND
         ($CONTENT_TYPE LIKE 'image/%' OR $CONTENT_TYPE LIKE 'video/%') AND
         $CONTENT_TYPE != 'image/svg+xml'
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/BackupMediaSnapshotTable.kt b/app/src/main/java/org/thoughtcrime/securesms/database/BackupMediaSnapshotTable.kt
index 49d32947fe..54b57a34d6 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/BackupMediaSnapshotTable.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/BackupMediaSnapshotTable.kt
@@ -129,7 +129,6 @@ class BackupMediaSnapshotTable(context: Context, database: SignalDatabase) : Dat
 
   /**
    * Writes the set of full-size media items that are slated to be referenced in the next backup, updating their pending sync time.
-   * Will insert multiple rows per object -- one for the main item, and one for the thumbnail.
    */
   fun writeFullSizePendingMediaObjects(mediaObjects: Sequence<ArchiveMediaItem>) {
     mediaObjects
@@ -143,7 +142,6 @@ class BackupMediaSnapshotTable(context: Context, database: SignalDatabase) : Dat
 
   /**
    * Writes the set of thumbnail media items that are slated to be referenced in the next backup, updating their pending sync time.
-   * Will insert multiple rows per object -- one for the main item, and one for the thumbnail.
    */
   fun writeThumbnailPendingMediaObjects(mediaObjects: Sequence<ArchiveMediaItem>) {
     mediaObjects