diff --git a/Signal/ConversationView/Components/CVComponentState.swift b/Signal/ConversationView/Components/CVComponentState.swift
index 9c89002249..32fb2dd0b6 100644
--- a/Signal/ConversationView/Components/CVComponentState.swift
+++ b/Signal/ConversationView/Components/CVComponentState.swift
@@ -1373,8 +1373,11 @@ private extension CVComponentState.Builder {
                             .paid(let optimizeLocalStorage),
                             .paidAsTester(let optimizeLocalStorage),
                             .paidExpiringSoon(let optimizeLocalStorage):
-                            mediaAlbumHasSkippedAttachment = optimizeLocalStorage
-                                && !canAutoDownloadAttachment(referencedAttachment: attachment)
+                            if optimizeLocalStorage {
+                                mediaAlbumHasSkippedAttachment = !canAutoDownloadAttachment(referencedAttachment: attachment)
+                            } else {
+                                mediaAlbumHasSkippedAttachment = true
+                            }
                         case
                             .free,
                             .disabled,