diff --git a/js/models/messages.js b/js/models/messages.js
index 9c16a55b8..dded20f96 100644
--- a/js/models/messages.js
+++ b/js/models/messages.js
@@ -217,6 +217,11 @@
                         lastMessage: message.get('body')
                     });
                 }
+                else if (!conversation.get('lastMessage')) {
+                    conversation.set({
+                        lastMessage: message.get('body')
+                    });
+                }
 
                 conversation.save().then(function() {
                     message.save().then(function() {