diff --git a/static/js/echo.js b/static/js/echo.js
index ec00fdc040..b53953ca26 100644
--- a/static/js/echo.js
+++ b/static/js/echo.js
@@ -52,7 +52,7 @@ function resend_message(message, row) {
         compose.send_message_success(message.local_id, message_id, start_time, true);
 
         // Resend succeeded, so mark as no longer failed
-        all_msg_list.get(message_id).failed_request = false;
+        message_store.get(message_id).failed_request = false;
         ui.show_failed_message_success(message_id);
     }, function error(response) {
         exports.message_send_error(message.local_id, response);
@@ -271,7 +271,7 @@ exports.process_from_server = function process_from_server(messages) {
 
 exports.message_send_error = function message_send_error(local_id, error_response) {
     // Error sending message, show inline
-    all_msg_list.get(local_id).failed_request = true;
+    message_store.get(local_id).failed_request = true;
     ui.show_message_failed(local_id, error_response);
 };
 
diff --git a/static/js/message_store.js b/static/js/message_store.js
index a58d617a9b..321daaf3b3 100644
--- a/static/js/message_store.js
+++ b/static/js/message_store.js
@@ -215,7 +215,7 @@ function maybe_add_narrowed_messages(messages, msg_list, messages_are_new) {
 
 exports.update_messages = function update_messages(events) {
     _.each(events, function (event) {
-        var msg = all_msg_list.get(event.message_id);
+        var msg = exports.get(event.message_id);
         if (msg === undefined) {
             return;
         }
@@ -235,7 +235,7 @@ exports.update_messages = function update_messages(events) {
             // event.message_ids. event.message_id is still the first message
             // where the user initiated the edit.
             _.each(event.message_ids, function (id) {
-                var msg = all_msg_list.get(id);
+                var msg = message_store.get(id);
                 if (msg === undefined) {
                     return;
                 }
diff --git a/static/js/ui.js b/static/js/ui.js
index b2b1e8dadb..447fd04ff1 100644
--- a/static/js/ui.js
+++ b/static/js/ui.js
@@ -889,7 +889,7 @@ exports.expand_summary_row = function (row) {
 exports.collapse_recipient_group = function (row) {
     var message_ids = row.attr('data-messages').split(',');
     var messages = _.map(message_ids, function (id) {
-        return all_msg_list.get(id);
+        return message_store.get(id);
     });
 
     _.each(messages, function (msg){