diff --git a/js/models/conversations.js b/js/models/conversations.js
index 028bfe4b1..d557e7d13 100644
--- a/js/models/conversations.js
+++ b/js/models/conversations.js
@@ -403,7 +403,8 @@
                     message        : message.getNotificationText(),
                     iconUrl        : iconUrl,
                     imageUrl       : message.getImageUrl(),
-                    conversationId : conversationId
+                    conversationId : conversationId,
+                    messageId      : message.id
                 });
             });
         });
diff --git a/js/models/messages.js b/js/models/messages.js
index 688f25cde..b017956da 100644
--- a/js/models/messages.js
+++ b/js/models/messages.js
@@ -367,6 +367,9 @@
         },
         markRead: function(sync) {
             this.unset('unread');
+            Whisper.Notifications.remove(Whisper.Notifications.where({
+                messageId: this.id
+            }));
             return this.save();
         }