diff --git a/keyserver/src/push/send.js b/keyserver/src/push/send.js
--- a/keyserver/src/push/send.js
+++ b/keyserver/src/push/send.js
@@ -136,11 +136,16 @@
         username &&
         threadInfo.currentUser.role &&
         oldValidUsernameRegex.test(username) &&
-        newMessageInfos.some(
-          newMessageInfo =>
-            newMessageInfo.type === messageTypes.TEXT &&
-            isMentioned(username, newMessageInfo.text),
-        );
+        newMessageInfos.some(newMessageInfo => {
+          const unwrappedMessageInfo =
+            newMessageInfo.type === messageTypes.SIDEBAR_SOURCE
+              ? newMessageInfo.sourceMessage
+              : newMessageInfo;
+          return (
+            unwrappedMessageInfo.type === messageTypes.TEXT &&
+            isMentioned(username, unwrappedMessageInfo.text)
+          );
+        });
       if (!updateBadge && !displayBanner && !userWasMentioned) {
         continue;
       }