diff --git a/web/templates/message_controls.hbs b/web/templates/message_controls.hbs
index 02ac760a68..7dc8d5b30b 100644
--- a/web/templates/message_controls.hbs
+++ b/web/templates/message_controls.hbs
@@ -17,5 +17,7 @@
 </div>
 
 <div class="star_container message_control_button {{#if msg/starred}}{{else}}empty-star{{/if}}" data-tooltip-template-id="{{#if msg/starred}}unstar{{else}}star{{/if}}-message-tooltip-template">
+    {{#unless msg/locally_echoed}}
     <i role="button" tabindex="0" class="message-controls-icon star zulip-icon {{#if msg/starred}}zulip-icon-star-filled{{else}}zulip-icon-star{{/if}}"></i>
+    {{/unless}}
 </div>