diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewRepository.kt
index 91a0b7a81e..d752f1da24 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewRepository.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewRepository.kt
@@ -66,7 +66,9 @@ class MediaPreviewRepository {
 
           for (i in 0..limit) {
             val element = MediaTable.MediaRecord.from(cursor)
-            mediaRecords.add(element)
+            if (element.attachment?.transferState == AttachmentTable.TRANSFER_PROGRESS_DONE || element.attachment?.transferState == AttachmentTable.TRANSFER_PROGRESS_STARTED) {
+              mediaRecords.add(element)
+            }
             if (!cursor.moveToNext()) {
               break
             }