diff --git a/js/models/messages.js b/js/models/messages.js
index 343c2806..a45b5315 100644
--- a/js/models/messages.js
+++ b/js/models/messages.js
@@ -209,7 +209,8 @@
                     errors         : []
                 });
 
-                if (message.get('sent_at') > conversation.get('timestamp')) {
+                var conversation_timestamp = conversation.get('timestamp');
+                if (!conversation_timestamp || message.get('sent_at') > conversation_timestamp) {
                     conversation.set({
                         timestamp: message.get('sent_at'),
                         lastMessage: message.get('body')