diff --git a/packages/stream_chat_flutter/lib/src/message_actions_modal.dart b/packages/stream_chat_flutter/lib/src/message_actions_modal.dart
index 23f3a096..e85e7cd8 100644
--- a/packages/stream_chat_flutter/lib/src/message_actions_modal.dart
+++ b/packages/stream_chat_flutter/lib/src/message_actions_modal.dart
@@ -533,7 +533,11 @@ class _MessageActionsModalState extends State<MessageActionsModal> {
       onTap: () {
         Navigator.pop(context);
         final channel = StreamChannel.of(context).channel;
-        channel.state?.retryFailedMessages();
+        if (isUpdateFailed) {
+          channel.updateMessage(widget.message);
+        } else {
+          channel.sendMessage(widget.message);
+        }
       },
       child: Padding(
         padding: const EdgeInsets.symmetric(vertical: 11, horizontal: 16),
@@ -606,7 +610,9 @@ class _MessageActionsModalState extends State<MessageActionsModal> {
                 widget.editMessageInputBuilder!(context, widget.message)
               else
                 MessageInput(
-                  editMessage: widget.message,
+                  messageInputController: MessageInputController(
+                    message: widget.message,
+                  ),
                   preMessageSending: (m) {
                     FocusScope.of(context).unfocus();
                     Navigator.pop(context);