diff --git a/src/plugins/messaging.rs b/src/plugins/messaging.rs
index dd20651616b6d7be1b0f375263f3b900b1e25847..c29adc341ebc2d6cf3c97138950c23ff3b804795 100644
--- a/src/plugins/messaging.rs
+++ b/src/plugins/messaging.rs
@@ -82,7 +82,7 @@ impl MessagingPlugin {
     }
 
     fn handle_message(&self, message: &Message) -> Propagation {
-        let from = message.from.clone().unwrap();
+        let from = message.from.clone().unwrap_or(self.proxy.get_own_jid());
         for payload in message.payloads.clone() {
             let payload = match MessagePayload::try_from(payload) {
                 Ok(payload) => payload,