diff --git a/js/models/messages.js b/js/models/messages.js
index 7c2022fe6..cb5927484 100644
--- a/js/models/messages.js
+++ b/js/models/messages.js
@@ -1971,7 +1971,10 @@
             } else {
               const ourNumber = textsecure.storage.user.getNumber();
 
-              if (message.attributes.body.indexOf(`@${ourNumber}`) !== -1) {
+              if (
+                message.attributes.body &&
+                message.attributes.body.indexOf(`@${ourNumber}`) !== -1
+              ) {
                 conversation.set({ mentionedUs: true });
               }