diff --git a/static/js/message_list_view.js b/static/js/message_list_view.js
index 0a514182a6..b7b7025637 100644
--- a/static/js/message_list_view.js
+++ b/static/js/message_list_view.js
@@ -718,6 +718,7 @@ MessageListView.prototype = {
             }
             row.setAttribute('zid', new_id);
             row.setAttribute('id', this.table_name + new_id);
+            $(row).removeClass('local');
             this._rows[new_id] = row;
         }
     }
diff --git a/static/js/ui.js b/static/js/ui.js
index ec9bbf4fa0..2af493892f 100644
--- a/static/js/ui.js
+++ b/static/js/ui.js
@@ -257,6 +257,10 @@ function message_hover(message_row) {
     if (current_message_hover && message_row && current_message_hover.attr("zid") === message_row.attr("zid")) {
         return;
     }
+    // Don't allow on-hover editing for local-only messages
+    if (message_row.hasClass('local')) {
+        return;
+    }
     message = current_msg_list.get(rows.id(message_row));
     message_unhover();
     message_row.addClass('message_hovered');