diff --git a/src/common/connection_handlers_events.py b/src/common/connection_handlers_events.py
index f044bfd31..0710455e7 100644
--- a/src/common/connection_handlers_events.py
+++ b/src/common/connection_handlers_events.py
@@ -1055,7 +1055,10 @@ class MessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent):
                 self.stanza = nbxmpp.Message(node=msg)
                 if carbon_marker.getName() == 'sent':
                     to = self.stanza.getTo()
-                    self.stanza.setTo(self.stanza.getFrom())
+                    frm = self.stanza.getFrom()
+                    if not frm:
+                        frm = gajim.get_jid_from_account(account)
+                    self.stanza.setTo(frm)
                     self.stanza.setFrom(to)
                     self.sent = True
                 try: