diff --git a/src/views/messages/container.jsx b/src/views/messages/container.jsx
index f6a32383c..0fd9a1b96 100644
--- a/src/views/messages/container.jsx
+++ b/src/views/messages/container.jsx
@@ -132,7 +132,9 @@ var Messages = React.createClass({
         } else {
             filteredMessages = messages;
             for (var j = 0; j < unreadCount; j++) {
-                filteredMessages[j].unread = true;
+                if (typeof filteredMessages[j] !== 'undefined') {
+                    filteredMessages[j].unread = true;
+                }
             }
         }
         return filteredMessages;