diff --git a/js/models/messages.js b/js/models/messages.js
index c13e05625..b2101b429 100644
--- a/js/models/messages.js
+++ b/js/models/messages.js
@@ -493,12 +493,16 @@
                                         //   because we need to start expiration timers, etc.
                                         message.markRead();
                                     }
+
                                     if (message.get('unread')) {
-                                        conversation.notify(message);
+                                        conversation.notify(message).then(function() {
+                                            confirm();
+                                            return resolve();
+                                        }, handleError);
+                                    } else {
+                                        confirm();
+                                        return resolve();
                                     }
-
-                                    confirm();
-                                    return resolve();
                                 }
                                 catch (e) {
                                     handleError(e);