diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewV2Fragment.kt b/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewV2Fragment.kt
index 57a2d23b4..be2dd3fa6 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewV2Fragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewV2Fragment.kt
@@ -198,14 +198,16 @@ class MediaPreviewV2Fragment : Fragment(R.layout.fragment_media_preview_v2), Med
     val currentItem: MediaDatabase.MediaRecord = currentState.mediaRecords[currentState.position]
     val currentFragment: Fragment? = childFragmentManager.findFragmentByTag("f${currentState.position}")
     val playbackControls = (currentFragment as? MediaPreviewFragment)?.playbackControls
-    val albumThumbnailMedia = currentState.mediaRecords.map { it.toMedia() }
+    val albumThumbnailMedia = currentState.mediaRecords
+      .filter { it.attachment != null && it.attachment!!.mmsId == currentItem.attachment?.mmsId }
+      .map { it.toMedia() }
     val caption = currentItem.attachment?.caption
-    if (albumThumbnailMedia.isEmpty() && caption == null && playbackControls == null) {
+    if (albumThumbnailMedia.size <= 1 && caption == null && playbackControls == null) {
       binding.mediaPreviewDetailsContainer.visibility = View.GONE
     } else {
       binding.mediaPreviewDetailsContainer.visibility = View.VISIBLE
     }
-    binding.mediaPreviewAlbumRail.visibility = if (albumThumbnailMedia.isEmpty()) View.GONE else View.VISIBLE
+    binding.mediaPreviewAlbumRail.visibility = if (albumThumbnailMedia.size <= 1) View.GONE else View.VISIBLE
     (binding.mediaPreviewAlbumRail.adapter as MediaRailAdapter).setMedia(albumThumbnailMedia, currentState.position)
     binding.mediaPreviewAlbumRail.smoothScrollToPosition(currentState.position)