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 7eb2606e..2210ef39 100644
--- a/packages/stream_chat_flutter/lib/src/attachment/giphy_attachment.dart
+++ b/packages/stream_chat_flutter/lib/src/attachment/giphy_attachment.dart
@@ -253,22 +253,7 @@ class GiphyAttachment extends AttachmentWidget {
   Widget _buildSentAttachment(BuildContext context, String imageUrl) =>
       SizedBox(
         child: GestureDetector(
-          onTap: () async {
-            final res =
-                await Navigator.push(context, MaterialPageRoute(builder: (_) {
-              final channel = StreamChannel.of(context).channel;
-              return StreamChannel(
-                channel: channel,
-                child: FullScreenMedia(
-                  mediaAttachments: [attachment],
-                  userName: message.user?.name,
-                  message: message,
-                  onShowMessage: onShowMessage,
-                ),
-              );
-            }));
-            if (res != null) onReturnAction!(res);
-          },
+          onTap: () => onAttachmentTap ?? _onImageTap(context),
           child: Stack(
             children: [
               CachedNetworkImage(