diff --git a/sat/core/xmpp.py b/sat/core/xmpp.py
index fae166fe..ef099267 100644
--- a/sat/core/xmpp.py
+++ b/sat/core/xmpp.py
@@ -690,6 +690,7 @@ class SatXMPPEntity:
 
         pre_xml_treatments.addCallback(lambda __: self.generateMessageXML(data, post_xml_treatments))
         pre_xml_treatments.addCallback(lambda __: post_xml_treatments)
+        pre_xml_treatments.addErrback(self._cancelErrorTrap)
         post_xml_treatments.addCallback(lambda __: self.sendMessageData(data))
         if send_only:
             log.debug(_("Triggers, storage and echo have been inhibited by the "