diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/AlbumThumbnailView.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/AlbumThumbnailView.kt
index d895e50743..3df431f446 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/AlbumThumbnailView.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/AlbumThumbnailView.kt
@@ -71,6 +71,9 @@ class AlbumThumbnailView : FrameLayout {
             if (Rect.intersects(rawRect, testRect)) {
                 // hit intersects with this particular child
                 val slide = slides.getOrNull(index) ?: return
+                // only open to downloaded images
+                if (slide.isInProgress || slide.isPendingDownload) return
+
                 ActivityDispatcher.get(context)?.dispatchIntent { context ->
                     MediaPreviewActivity.getPreviewIntent(context, slide, mms)
                 }