diff --git a/core/activitypub/note.js b/core/activitypub/note.js
index d83c30ab..cb751528 100644
--- a/core/activitypub/note.js
+++ b/core/activitypub/note.js
@@ -405,7 +405,7 @@ module.exports = class Note extends ActivityPubObject {
         //    or 32 characters in length, whichever comes first
         //  - If not end of string, we'll sub in '...'
         //
-        let subject = message.message.replace(/^@[^ ]+ /, '').trim();
+        let subject = message.message.replace(/^@[^ ,]+ /, '').trim();
         const m = /^(.+)\r?\n/.exec(subject);
         if (m && m[1]) {
             subject = m[1];
@@ -423,7 +423,7 @@ module.exports = class Note extends ActivityPubObject {
             return;
         }
 
-        const m = /^(@[^ ]+) ./.exec(message.message);
+        const m = /^(@[^ ,]+) ./.exec(message.message);
         if (m && m[1]) {
             message.toUserName = m[1];
         }