diff --git a/ElementX/Sources/Screens/Timeline/View/TimelineItemViews/GalleryItemTileView.swift b/ElementX/Sources/Screens/Timeline/View/TimelineItemViews/GalleryItemTileView.swift
index 26fd01ad2..86f5304f7 100644
--- a/ElementX/Sources/Screens/Timeline/View/TimelineItemViews/GalleryItemTileView.swift
+++ b/ElementX/Sources/Screens/Timeline/View/TimelineItemViews/GalleryItemTileView.swift
@@ -32,8 +32,6 @@ struct GalleryItemTileView: View {
                             videoOverlay
                         }
                     }
-                    .contentShape(Rectangle())
-                    .onTapGesture { onTap() }
                     .accessibilityElement(children: .ignore)
                     .accessibilityLabel(item.filename)
             } scanningContent: {
@@ -46,6 +44,9 @@ struct GalleryItemTileView: View {
                 overflowOverlay
             }
         }
+        // Tappable in every scan state, so that an unsafe item can't hide the rest of the gallery.
+        .contentShape(Rectangle())
+        .onTapGesture { onTap() }
     }
     
     @ViewBuilder
diff --git a/ElementX/Sources/Services/Room/RoomSummary/RoomMessageEventStringBuilder.swift b/ElementX/Sources/Services/Room/RoomSummary/RoomMessageEventStringBuilder.swift
index 98eaa7ff5..a315c1586 100644
--- a/ElementX/Sources/Services/Room/RoomSummary/RoomMessageEventStringBuilder.swift
+++ b/ElementX/Sources/Services/Room/RoomSummary/RoomMessageEventStringBuilder.swift
@@ -107,7 +107,7 @@ nonisolated struct RoomMessageEventStringBuilder {
     }
     
     private func buildMessage(for style: Style, caption: String?, type: String) -> AttributedString {
-        guard let caption else {
+        guard let caption, !caption.isBlank else {
             return AttributedString(type)
         }