diff --git a/web/hwlab-cloud-web/src/stores/workbench.ts b/web/hwlab-cloud-web/src/stores/workbench.ts
index 3ba54e31..63323bae 100644
--- a/web/hwlab-cloud-web/src/stores/workbench.ts
+++ b/web/hwlab-cloud-web/src/stores/workbench.ts
@@ -1443,7 +1443,7 @@ function nonBlockingProjection(projection: ProjectionDiagnostic | null): Project
   function stableAdmissionTimingPatchForRunningMessage(message: ChatMessage, patch: Partial<ChatMessage>): Partial<ChatMessage> {
     const incoming = patch.timing;
     const existing = message.timing;
-    if (!incoming || !existing?.startedAt || !isRunningMessage(message)) return patch;
+    if (!incoming || !existing?.startedAt || !isRunningAgentMessageForTiming(message)) return patch;
     const timing = {
       ...incoming,
       startedAt: existing.startedAt,
@@ -1455,6 +1455,13 @@ function nonBlockingProjection(projection: ProjectionDiagnostic | null): Project
     return { ...patch, timing, startedAt: timing.startedAt ?? null, lastEventAt: timing.lastEventAt ?? null, finishedAt: null, durationMs: null };
   }
 
+  function isRunningAgentMessageForTiming(message: ChatMessage): boolean {
+    if (message.role !== "agent") return false;
+    const status = normalizedStatusText(firstNonEmptyString(message.status, message.runnerTrace?.status));
+    if (status && isTerminalMessageStatus(status)) return false;
+    return status === null || isTraceActiveStatus(status) || message.traceAutoLifecycle === "running";
+  }
+
   function optimisticAdmissionTimingPatch(lifecycle: AgentChatResponse): Partial<ChatMessage> {
     const patch = messageTimingPatch(lifecycle);
     if (patch.timing?.startedAt && patch.timing?.lastEventAt) return patch;