diff --git a/lib/features/base/mixin/message_dialog_action_mixin.dart b/lib/features/base/mixin/message_dialog_action_mixin.dart
index e993b1dff..8f79fabaa 100644
--- a/lib/features/base/mixin/message_dialog_action_mixin.dart
+++ b/lib/features/base/mixin/message_dialog_action_mixin.dart
@@ -14,6 +14,7 @@ mixin MessageDialogActionMixin {
       String actionName,
       {
         Function? onConfirmAction,
+        Function? onCancelAction,
         String? title,
         String? cancelTitle,
         bool hasCancelButton = true,
@@ -56,7 +57,13 @@ mixin MessageDialogActionMixin {
                 popBack();
                 onConfirmAction?.call();
             })
-            ..onCancelButtonAction(hasCancelButton ? cancelTitle ?? AppLocalizations.of(context).cancel : '', () => popBack())
+            ..onCancelButtonAction(
+                hasCancelButton ? cancelTitle ?? AppLocalizations.of(context).cancel : '',
+                () {
+                  popBack();
+                  onCancelAction?.call();
+                }
+            )
           ).build()
         )
       );
@@ -91,7 +98,13 @@ mixin MessageDialogActionMixin {
                     popBack();
                     onConfirmAction?.call();
                 })
-                ..onCancelButtonAction(hasCancelButton ? cancelTitle ?? AppLocalizations.of(context).cancel : '', () => popBack())
+                ..onCancelButtonAction(
+                    hasCancelButton ? cancelTitle ?? AppLocalizations.of(context).cancel : '',
+                    () {
+                      popBack();
+                      onCancelAction?.call();
+                    }
+                )
                 ..onCloseButtonAction(() => popBack()))
               .build()));
         } else {
@@ -100,7 +113,13 @@ mixin MessageDialogActionMixin {
             ..styleConfirmButton(const TextStyle(fontSize: 20, fontWeight: FontWeight.normal, color: Colors.black))
             ..styleMessage(messageStyle)
             ..styleCancelButton(cancelStyle)
-            ..onCancelAction(cancelTitle ?? AppLocalizations.of(context).cancel, () => popBack())
+            ..onCancelAction(
+                cancelTitle ?? AppLocalizations.of(context).cancel,
+                () {
+                  popBack();
+                  onCancelAction?.call();
+                }
+            )
             ..onConfirmAction(actionName, () {
                 popBack();
                 onConfirmAction?.call();
@@ -130,7 +149,13 @@ mixin MessageDialogActionMixin {
                 popBack();
                 onConfirmAction?.call();
               })
-              ..onCancelButtonAction(hasCancelButton ? cancelTitle ?? AppLocalizations.of(context).cancel : '', () => popBack())
+              ..onCancelButtonAction(
+                  hasCancelButton ? cancelTitle ?? AppLocalizations.of(context).cancel : '',
+                  () {
+                    popBack();
+                    onCancelAction?.call();
+                  }
+              )
               ..onCloseButtonAction(() => popBack()))
             .build()
           )
diff --git a/lib/features/composer/presentation/composer_controller.dart b/lib/features/composer/presentation/composer_controller.dart
index a71e3178b..fbc008989 100644
--- a/lib/features/composer/presentation/composer_controller.dart
+++ b/lib/features/composer/presentation/composer_controller.dart
@@ -936,6 +936,10 @@ class ComposerController extends BaseController {
         uploadController.clearInlineFileUploaded();
         _closeComposerAction(result: sendingEmailArguments);
       },
+      onCancelAction: () {
+        uploadController.clearInlineFileUploaded();
+        _closeComposerAction();
+      },
       title: AppLocalizations.of(currentContext!).youAreInOfflineMode,
       icon: SvgPicture.asset(_imagePaths.icDialogOfflineMode),
       alignCenter: true,