diff --git a/packages/message-parser/package.json b/packages/message-parser/package.json
index 01bead84d7..7c8c7b879f 100644
--- a/packages/message-parser/package.json
+++ b/packages/message-parser/package.json
@@ -80,5 +80,8 @@
   },
   "dependencies": {
     "tldts": "~5.7.104"
+  },
+  "volta": {
+    "extends": "../../package.json"
   }
 }
diff --git a/packages/message-parser/tests/email.test.ts b/packages/message-parser/tests/email.test.ts
index 4e841385a9..bcdaeaec3c 100644
--- a/packages/message-parser/tests/email.test.ts
+++ b/packages/message-parser/tests/email.test.ts
@@ -139,6 +139,7 @@ test.each([
     'My email is fake@gmail.comf',
     [paragraph([plain('My email is fake@gmail.comf')])],
   ],
+  ['@example.com', [paragraph([plain('@example.com')])]],
 ])('parses %p', (input, output) => {
   expect(parse(input)).toMatchObject(output);
 });
diff --git a/packages/message-parser/tests/emoji.test.ts b/packages/message-parser/tests/emoji.test.ts
index 3d64e59a2c..ac6226f55e 100644
--- a/packages/message-parser/tests/emoji.test.ts
+++ b/packages/message-parser/tests/emoji.test.ts
@@ -85,6 +85,7 @@ test.each([
   ],
   ['👆🏺', [bigEmoji([emojiUnicode('👆'), emojiUnicode('🏺')])]],
   ['Hi 👍', [paragraph([plain('Hi '), emojiUnicode('👍')])]],
+  ['🚴🏽‍♀️', [bigEmoji([emojiUnicode('🚴🏽‍♀️')])]],
 ])('parses %p', (input, output) => {
   expect(parse(input)).toMatchObject(output);
 });
diff --git a/packages/message-parser/tests/inlineCode.test.ts b/packages/message-parser/tests/inlineCode.test.ts
index 3b2766e042..32522816cb 100644
--- a/packages/message-parser/tests/inlineCode.test.ts
+++ b/packages/message-parser/tests/inlineCode.test.ts
@@ -17,6 +17,10 @@ test.each([
       ]),
     ],
   ],
+  [
+    '`@rocket.chat/message-parser`',
+    [paragraph([inlineCode(plain('@rocket.chat/message-parser'))])],
+  ],
 ])('parses %p', (input, output) => {
   expect(parse(input)).toMatchObject(output);
 });