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 e8e165f829..994cf43229 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/AttachmentTable.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/AttachmentTable.kt
@@ -856,6 +856,35 @@ class AttachmentTable(
       .readToSingleLong()
   }
 
+  /**
+   * Returns sum of the file sizes of attachments that are not fully uploaded to the archive CDN.
+   */
+  fun debugGetPendingArchiveUploadAttachments(): List<DatabaseAttachment> {
+    return readableDatabase
+      .rawQuery(
+        """
+          SELECT *
+          FROM $TABLE_NAME as t
+          JOIN (
+            SELECT DISTINCT $DATA_HASH_END, $REMOTE_KEY, $DATA_SIZE
+            FROM $TABLE_NAME LEFT JOIN ${MessageTable.TABLE_NAME} ON $TABLE_NAME.$MESSAGE_ID = ${MessageTable.TABLE_NAME}.${MessageTable.ID}
+            WHERE
+              $DATA_FILE NOT NULL AND
+              $DATA_HASH_END NOT NULL AND
+              $REMOTE_KEY NOT NULL AND
+              $ARCHIVE_TRANSFER_STATE NOT IN (${ArchiveTransferState.FINISHED.value}, ${ArchiveTransferState.PERMANENT_FAILURE.value}) AND
+              $CONTENT_TYPE != '${MediaUtil.LONG_TEXT}' AND
+              (${MessageTable.STORY_TYPE} = 0 OR ${MessageTable.STORY_TYPE} IS NULL) AND
+              (${MessageTable.EXPIRES_IN} = 0 OR ${MessageTable.EXPIRES_IN} > ${ChatItemArchiveExporter.EXPIRATION_CUTOFF.inWholeMilliseconds})
+          ) as filtered
+          ON t.$DATA_HASH_END = filtered.$DATA_HASH_END
+        """.trimIndent()
+      )
+      .readToList {
+        it.readAttachment()
+      }
+  }
+
   fun deleteAttachmentsForMessage(mmsId: Long): Boolean {
     Log.d(TAG, "[deleteAttachmentsForMessage] mmsId: $mmsId")
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionRemoteBackups.kt b/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionRemoteBackups.kt
index 05ed9c07a4..c1370b10d1 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionRemoteBackups.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionRemoteBackups.kt
@@ -76,6 +76,27 @@ class LogSectionRemoteBackups : LogSection {
       output.append("None\n")
     }
 
+    output.append("\n -- ArchiveUploadProgress\n")
+    if (SignalStore.backup.archiveUploadState != null) {
+      output.append("State: ${SignalStore.backup.archiveUploadState}\n")
+      output.append("Pending bytes: ${SignalDatabase.attachments.getPendingArchiveUploadBytes()}\n")
+
+      val pendingAttachments = SignalDatabase.attachments.debugGetPendingArchiveUploadAttachments()
+      if (pendingAttachments.isNotEmpty()) {
+        output.append("Pending attachments:\n")
+        output.append("  Count: ${pendingAttachments.size}\n")
+        output.append("  Sum of Size: ${pendingAttachments.sumOf { it.size }}\n")
+        output.append("  Content types:\n")
+        pendingAttachments.groupBy { it.contentType }.forEach { (contentType, attachments) ->
+          output.append("    $contentType: ${attachments.size}\n")
+        }
+      } else {
+        output.append("Pending attachments: None!\n")
+      }
+    } else {
+      output.append("None\n")
+    }
+
     return output
   }
 }