diff --git a/packages/core/src/command/index.ts b/packages/core/src/command/index.ts
index f9b7b41ab..4254c8312 100644
--- a/packages/core/src/command/index.ts
+++ b/packages/core/src/command/index.ts
@@ -82,6 +82,9 @@ export class Commander extends Map<string, Command> {
     })
 
     ctx.before('attach', (session) => {
+      const { hasAt, appel } = session.stripped
+      if (!appel && hasAt) return
+
       // strip prefix
       let content = session.stripped.content
       for (const prefix of this._resolvePrefixes(session)) {
diff --git a/packages/core/src/session.ts b/packages/core/src/session.ts
index b646e9c36..4464e6aee 100644
--- a/packages/core/src/session.ts
+++ b/packages/core/src/session.ts
@@ -116,7 +116,7 @@ export class Session<U extends User.Field = never, G extends Channel.Field = nev
         atSelf = appel = true
       }
       // quote messages may contain mentions
-      if (this.quote?.user?.id && this.quote.user.id !== attrs.id) {
+      if (!this.quote?.user?.id || this.quote.user.id !== attrs.id) {
         hasAt = true
       }
       // @ts-ignore