diff --git a/packages/stream_chat_flutter/lib/src/message_widget.dart b/packages/stream_chat_flutter/lib/src/message_widget.dart
index 77cfa8b2..81981dad 100644
--- a/packages/stream_chat_flutter/lib/src/message_widget.dart
+++ b/packages/stream_chat_flutter/lib/src/message_widget.dart
@@ -1111,8 +1111,11 @@ class _StreamMessageWidgetState extends State<StreamMessageWidget>
               widget.onThreadTap != null,
           showFlagButton: widget.showFlagButton,
           customActions: widget.customActions,
-          showDeleteMessage: widget.showDeleteMessage,
-          showEditMessage: widget.showEditMessage,
+          showDeleteMessage: widget.showDeleteMessage || isDeleteFailed,
+          showEditMessage: widget.showEditMessage &&
+              !isDeleteFailed &&
+              !widget.message.attachments
+                  .any((element) => element.type == 'giphy'),
           showPinButton: widget.showPinButton,
           showReactions: widget.showReactions,
         ),