diff --git a/frontend_tests/node_tests/message_flags.js b/frontend_tests/node_tests/message_flags.js
index ef1ffbaa8e..d9ee0f7fe6 100644
--- a/frontend_tests/node_tests/message_flags.js
+++ b/frontend_tests/node_tests/message_flags.js
@@ -23,7 +23,7 @@ run_test('starred', () => {
         posted_data = opts.data;
     };
 
-    message_flags.toggle_starred(message);
+    message_flags.toggle_starred_and_update_server(message);
 
     assert(ui_updated);
 
@@ -40,7 +40,7 @@ run_test('starred', () => {
 
     ui_updated = false;
 
-    message_flags.toggle_starred(message);
+    message_flags.toggle_starred_and_update_server(message);
 
     assert(ui_updated);
 
diff --git a/static/js/click_handlers.js b/static/js/click_handlers.js
index 4104c80be7..9720649b46 100644
--- a/static/js/click_handlers.js
+++ b/static/js/click_handlers.js
@@ -181,7 +181,7 @@ exports.initialize = function () {
 
         var message_id = rows.id($(this).closest(".message_row"));
         var message = message_store.get(message_id);
-        message_flags.toggle_starred(message);
+        message_flags.toggle_starred_and_update_server(message);
     });
 
     $("#main_div").on("click", ".message_reaction", function (e) {
diff --git a/static/js/hotkey.js b/static/js/hotkey.js
index 68b7151e1a..b86e0558a7 100644
--- a/static/js/hotkey.js
+++ b/static/js/hotkey.js
@@ -707,7 +707,7 @@ exports.process_hotkey = function (e, hotkey) {
     case 'message_actions':
         return popovers.open_message_menu(msg);
     case 'star_message':
-        message_flags.toggle_starred(msg);
+        message_flags.toggle_starred_and_update_server(msg);
         return true;
     case 'narrow_by_recipient':
         return do_narrow_action(narrow.by_recipient);
diff --git a/static/js/message_flags.js b/static/js/message_flags.js
index 387ae7afae..fb56c7b6cb 100644
--- a/static/js/message_flags.js
+++ b/static/js/message_flags.js
@@ -83,7 +83,7 @@ exports.update_starred_flag = function (message_id, new_value) {
     ui.update_starred_view(message_id, new_value);
 };
 
-exports.toggle_starred = function (message) {
+exports.toggle_starred_and_update_server = function (message) {
     if (message.locally_echoed) {
         // This is defensive code for when you hit the "*" key
         // before we get a server ack.  It's rare that somebody