diff --git a/static/js/ui.js b/static/js/ui.js
index d06d066ec3..256b91576a 100644
--- a/static/js/ui.js
+++ b/static/js/ui.js
@@ -210,6 +210,11 @@ exports.update_starred = function (message_id, starred) {
     // lists.
     var message = exports.find_message(message_id);
 
+    // If it isn't cached in the browser, no need to do anything
+    if (message === undefined) {
+        return;
+    }
+
     unread.mark_message_as_read(message);
 
     message.starred = starred;