diff --git a/src/bacon.rs b/src/bacon.rs
index 5c2c0c0..85437f2 100644
--- a/src/bacon.rs
+++ b/src/bacon.rs
@@ -87,6 +87,10 @@ pub async fn handle_message(p: ChatPacket, client: &mut Client, config: &Arc<RwL
         return;
     }
 
+    if p.uuid() == Some(config.read().await.relay.uuid) && components[0].starts_with('@') {
+        components.remove(0);
+    }
+
     let is_for_me = components[0].starts_with(&format!("!@{}", config.read().await.relay.username)) || (!components[0].starts_with("!@") && components[0].starts_with("!"));
 
     if !is_for_me { return; }