diff --git a/mail_post_defer/models/mail_thread.py b/mail_post_defer/models/mail_thread.py
index cb213a7b8d..8938e3e1e6 100644
--- a/mail_post_defer/models/mail_thread.py
+++ b/mail_post_defer/models/mail_thread.py
@@ -12,8 +12,10 @@ class MailThread(models.AbstractModel):
     def message_post(self, **kwargs):
         """Post messages using queue by default."""
         _self = self
-        force_send = self.env.context.get("mail_notify_force_send") or kwargs.get(
-            "force_send", False
+        force_send = (
+            self.env.context.get("mail_notify_force_send")
+            or self.env.context.get("force_send")
+            or kwargs.get("force_send", False)
         )
         kwargs.setdefault("force_send", force_send)
         if not force_send:
diff --git a/mail_post_defer/tests/test_mail.py b/mail_post_defer/tests/test_mail.py
index a332518414..c1716d0671 100644
--- a/mail_post_defer/tests/test_mail.py
+++ b/mail_post_defer/tests/test_mail.py
@@ -69,6 +69,30 @@ def test_forced_context(self):
                 fields_values={"scheduled_date": False},
             )
 
+    def test_forced_context_with_template(self):
+        """A forced send via context is sent directly when using a template."""
+        with self.mock_mail_gateway():
+            mail_template = self.env["mail.template"].create(
+                {
+                    "model_id": self.env.ref("base.model_res_partner").id,
+                    "body_html": "<p>test body</p>",
+                    "partner_to": f"{self.partner_employee.id}",
+                }
+            )
+            self.partner_portal.with_context(
+                force_send=True
+            ).message_post_with_template(
+                mail_template.id,
+                composition_mode="comment",
+            )
+            self.assertMailMail(
+                self.partner_employee,
+                "sent",
+                author=self.env.user.partner_id,
+                content="test body",
+                fields_values={"scheduled_date": False},
+            )
+
     def test_no_msg_edit(self):
         """Cannot update messages.