diff --git a/js/models/messages.js b/js/models/messages.js
index 2c39b390e..1cffc13ea 100644
--- a/js/models/messages.js
+++ b/js/models/messages.js
@@ -347,15 +347,12 @@
                         var conversation_timestamp = conversation.get('timestamp');
                         if (!conversation_timestamp || message.get('sent_at') > conversation_timestamp) {
                             conversation.set({
-                                timestamp: message.get('sent_at'),
-                                lastMessage: message.getNotificationText()
-                            });
-                        }
-                        else if (!conversation.get('lastMessage')) {
-                            conversation.set({
-                                lastMessage: message.getNotificationText()
+                                timestamp: message.get('sent_at')
                             });
                         }
+                        conversation.set({
+                            lastMessage: message.getNotificationText()
+                        });
 
                         message.save().then(function() {
                             conversation.save().then(function() {