diff --git a/sat/plugins/plugin_xep_0374.py b/sat/plugins/plugin_xep_0374.py
index d0485a33..1256cf6c 100644
--- a/sat/plugins/plugin_xep_0374.py
+++ b/sat/plugins/plugin_xep_0374.py
@@ -209,7 +209,10 @@ class XEP_0374:
             if sender_jid.userhostJID() == client.jid.userhostJID():
                 # TODO: I've seen this cause an exception "builtins.KeyError: 'to'", seems
                 # like "to" isn't always set.
-                feedback_jid = jid.JID(message_elt["to"])
+                try:
+                    feedback_jid = jid.JID(message_elt["to"])
+                except KeyError:
+                    feedback_jid = client.server_jid
             else:
                 feedback_jid = sender_jid
 
diff --git a/sat/plugins/plugin_xep_0384.py b/sat/plugins/plugin_xep_0384.py
index e3c6c781..e0848c66 100644
--- a/sat/plugins/plugin_xep_0384.py
+++ b/sat/plugins/plugin_xep_0384.py
@@ -75,7 +75,6 @@ __all__ = [  # pylint: disable=unused-variable
     "OMEMO"
 ]
 
-
 log = cast(Logger, getLogger(__name__))  # type: ignore[no-untyped-call]
 
 
@@ -1572,7 +1571,10 @@ class OMEMO:
             if sender_jid.userhostJID() == client.jid.userhostJID():
                 # TODO: I've seen this cause an exception "builtins.KeyError: 'to'", seems
                 # like "to" isn't always set.
-                feedback_jid = jid.JID(message_elt["to"])
+                try:
+                    feedback_jid = jid.JID(message_elt["to"])
+                except KeyError:
+                    feedback_jid = client.server_jid
             else:
                 feedback_jid = sender_jid