diff --git a/js/views/conversation_view.js b/js/views/conversation_view.js
index 858ecae70..b01aead80 100644
--- a/js/views/conversation_view.js
+++ b/js/views/conversation_view.js
@@ -1271,7 +1271,7 @@
         attachment,
         document,
         getAbsolutePath: getAbsoluteAttachmentPath,
-        timestamp: message.get('sent_at'),
+        timestamp: message.get? message.get('sent_at'): message.sent_at,
       });
     },