diff --git a/src/views/SearchView.vue b/src/views/SearchView.vue
index 9860704..0ad0f55 100644
--- a/src/views/SearchView.vue
+++ b/src/views/SearchView.vue
@@ -779,6 +779,8 @@ function cancelRename() {
 async function handleSelectSession(s: SearchSession) {
   setCurrentSession(s)
   showHistory.value = false
+  // Wait for messages to load from API
+  await loadMessages(s.id)
   // Restore messages from session
   const restoredMessages = sessionMessages.value.map((m: SearchMessage) => {
     const isUser = m.role === 'user'