diff --git a/js/views/conversation_view.js b/js/views/conversation_view.js
index 4db60a6d25c1..69e85c0882dc 100644
--- a/js/views/conversation_view.js
+++ b/js/views/conversation_view.js
@@ -1733,7 +1733,12 @@
         window.log.warn(`onOpened: Did not find message ${messageId}`);
       }
 
-      this.loadNewestMessages();
+      // Incoming messages may still be processing, so we wait until those are
+      //   complete to pull the 500 most-recent messages in this conversation.
+      this.model.queueJob(() => {
+        this.loadNewestMessages();
+        this.model.updateLastMessage();
+      });
 
       this.focusMessageField();
 
@@ -1742,8 +1747,6 @@
         this.setQuoteMessage(quotedMessageId);
       }
 
-      this.model.updateLastMessage();
-
       const statusPromise = this.model.throttledGetProfiles();
       // eslint-disable-next-line more/no-then
       this.statusFetch = statusPromise.then(() =>