diff --git a/packages/stream_chat_flutter/lib/src/attachment/giphy_attachment.dart b/packages/stream_chat_flutter/lib/src/attachment/giphy_attachment.dart
index fc0fb586..cc29f0b2 100644
--- a/packages/stream_chat_flutter/lib/src/attachment/giphy_attachment.dart
+++ b/packages/stream_chat_flutter/lib/src/attachment/giphy_attachment.dart
@@ -246,7 +246,8 @@ class GiphyAttachment extends AttachmentWidget {
           return StreamChannel(
             channel: channel,
             child: FullScreenMedia(
-              mediaAttachments: [attachment],
+              mediaAttachments: message.attachments,
+              startIndex: message.attachments.indexOf(attachment),
               userName: message.user?.name,
               message: message,
               onShowMessage: onShowMessage,
diff --git a/packages/stream_chat_flutter/lib/src/attachment/image_attachment.dart b/packages/stream_chat_flutter/lib/src/attachment/image_attachment.dart
index 41b8d039..ff01eea3 100644
--- a/packages/stream_chat_flutter/lib/src/attachment/image_attachment.dart
+++ b/packages/stream_chat_flutter/lib/src/attachment/image_attachment.dart
@@ -141,7 +141,9 @@ class ImageAttachment extends AttachmentWidget {
                                 return StreamChannel(
                                   channel: channel,
                                   child: FullScreenMedia(
-                                    mediaAttachments: [attachment],
+                                    mediaAttachments: message.attachments,
+                                    startIndex:
+                                        message.attachments.indexOf(attachment),
                                     userName: message.user?.name,
                                     message: message,
                                     onShowMessage: onShowMessage,
diff --git a/packages/stream_chat_flutter/lib/src/attachment/video_attachment.dart b/packages/stream_chat_flutter/lib/src/attachment/video_attachment.dart
index ce4ac804..0fc97d5e 100644
--- a/packages/stream_chat_flutter/lib/src/attachment/video_attachment.dart
+++ b/packages/stream_chat_flutter/lib/src/attachment/video_attachment.dart
@@ -87,7 +87,9 @@ class VideoAttachment extends AttachmentWidget {
                           builder: (_) => StreamChannel(
                             channel: channel,
                             child: FullScreenMedia(
-                              mediaAttachments: [attachment],
+                              mediaAttachments: message.attachments,
+                              startIndex:
+                                  message.attachments.indexOf(attachment),
                               userName: message.user?.name,
                               message: message,
                               onShowMessage: onShowMessage,