diff --git a/Session/Utilities/MentionUtilities.swift b/Session/Utilities/MentionUtilities.swift
index 5c888b09d..0faeb712a 100644
--- a/Session/Utilities/MentionUtilities.swift
+++ b/Session/Utilities/MentionUtilities.swift
@@ -14,7 +14,7 @@ public final class MentionUtilities : NSObject {
             MentionsManager.populateUserPublicKeyCacheIfNeeded(for: threadID, in: transaction)
         }
         var string = string
-        let regex = try! NSRegularExpression(pattern: "@[0-9a-fA-F]*", options: [])
+        let regex = try! NSRegularExpression(pattern: "@[0-9a-fA-F]{66}", options: [])
         let knownPublicKeys = MentionsManager.userPublicKeyCache[threadID] ?? [] // Should always be populated at this point
         var mentions: [(range: NSRange, publicKey: String)] = []
         var outerMatch = regex.firstMatch(in: string, options: .withoutAnchoringBounds, range: NSRange(location: 0, length: string.utf16.count))
diff --git a/SessionNotificationServiceExtension/NotificationServiceExtension.swift b/SessionNotificationServiceExtension/NotificationServiceExtension.swift
index fd51ffd0b..9565a7be4 100644
--- a/SessionNotificationServiceExtension/NotificationServiceExtension.swift
+++ b/SessionNotificationServiceExtension/NotificationServiceExtension.swift
@@ -201,7 +201,7 @@ private extension String {
     func replacingMentions(for threadID: String, using transaction: YapDatabaseReadWriteTransaction) -> String {
         MentionsManager.populateUserPublicKeyCacheIfNeeded(for: threadID, in: transaction)
         var result = self
-        let regex = try! NSRegularExpression(pattern: "@[0-9a-fA-F]*", options: [])
+        let regex = try! NSRegularExpression(pattern: "@[0-9a-fA-F]{66}", options: [])
         let knownPublicKeys = MentionsManager.userPublicKeyCache[threadID] ?? []
         var mentions: [(range: NSRange, publicKey: String)] = []
         var m0 = regex.firstMatch(in: result, options: .withoutAnchoringBounds, range: NSRange(location: 0, length: result.utf16.count))