diff --git a/app/src/main/java/com/openclaw/dashboard/presentation/MainViewModel.kt b/app/src/main/java/com/openclaw/dashboard/presentation/MainViewModel.kt
index 6541376..0350f52 100644
--- a/app/src/main/java/com/openclaw/dashboard/presentation/MainViewModel.kt
+++ b/app/src/main/java/com/openclaw/dashboard/presentation/MainViewModel.kt
@@ -306,7 +306,11 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
                         )
                     )
                 }
-                _chatMessages.value = historyEvents
+                _chatMessages.update { currentMessages ->
+                    // Keep messages that are not history (e.g. optimistic user messages or live AI deltas)
+                    val pendingMessages = currentMessages.filter { !it.runId.startsWith("history-") }
+                    historyEvents + pendingMessages
+                }
             }
         }
     }