diff --git a/lib/push/utils.js b/lib/push/utils.js
--- a/lib/push/utils.js
+++ b/lib/push/utils.js
@@ -122,16 +122,14 @@
     promises.push(
       ...messageIndices.map(async messageIndex => {
         const messageInfo = newMessageInfos[messageIndex];
-        if (messageInfo.creatorID === userID) {
-          // We don't need to notify the message author about their message
-          return undefined;
-        }
-
         const { type } = messageInfo;
         const { getMessageNotifyType } = messageSpecs[type];
 
         let messageNotifyType = messageNotifyTypes.SET_UNREAD;
-        if (getMessageNotifyType) {
+        if (messageInfo.creatorID === userID) {
+          // We don't need to notify the message author about their message
+          messageNotifyType = messageNotifyTypes.NONE;
+        } else if (getMessageNotifyType) {
           messageNotifyType = await getMessageNotifyType(messageInfo, {
             notifTargetUserID: userID,
             userNotMemberOfSubthreads,