diff --git a/zephyr/static/js/message_list.js b/zephyr/static/js/message_list.js
index 8913b2a87d..80a27da788 100644
--- a/zephyr/static/js/message_list.js
+++ b/zephyr/static/js/message_list.js
@@ -589,7 +589,9 @@ MessageList.prototype = {
         // things.
         this._clear_rendering_state();
         this._rerender_preserving_scrolltop();
-        this.select_id(this._selected_id);
+        if (this._selected_id !== -1) {
+            this.select_id(this._selected_id);
+        }
     },
 
     all: function MessageList_all() {