diff --git a/packages/cli/src/ui/components/HistoryItemDisplay.tsx b/packages/cli/src/ui/components/HistoryItemDisplay.tsx
index ab804d202..b52a2b9bf 100644
--- a/packages/cli/src/ui/components/HistoryItemDisplay.tsx
+++ b/packages/cli/src/ui/components/HistoryItemDisplay.tsx
@@ -209,6 +209,8 @@ const HistoryItemDisplayComponent: React.FC<HistoryItemDisplayProps> = ({
           skills={itemForDisplay.skills}
           isEstimated={itemForDisplay.isEstimated}
           showDetails={itemForDisplay.showDetails}
+        />
+      )}
       {itemForDisplay.type === 'arena_agent_complete' && (
         <ArenaAgentCard agent={itemForDisplay.agent} width={boxWidth} />
       )}
diff --git a/packages/core/src/core/geminiChat.ts b/packages/core/src/core/geminiChat.ts
index 1d7036709..74e15deba 100644
--- a/packages/core/src/core/geminiChat.ts
+++ b/packages/core/src/core/geminiChat.ts
@@ -34,7 +34,11 @@ import {
   ContentRetryEvent,
   ContentRetryFailureEvent,
 } from '../telemetry/types.js';
-import type { UiTelemetryService } from '../telemetry/uiTelemetry.js';
+import type {
+  UiTelemetryService} from '../telemetry/uiTelemetry.js';
+import {
+  uiTelemetryService,
+} from '../telemetry/uiTelemetry.js';
 
 const debugLogger = createDebugLogger('QWEN_CODE_CHAT');
 
@@ -659,10 +663,14 @@ export class GeminiChat {
         const lastPromptTokenCount =
           usageMetadata.totalTokenCount || usageMetadata.promptTokenCount;
         if (lastPromptTokenCount) {
-          uiTelemetryService.setLastPromptTokenCount(lastPromptTokenCount);
+          (this.telemetryService ?? uiTelemetryService).setLastPromptTokenCount(
+            lastPromptTokenCount,
+          );
         }
         if (usageMetadata.cachedContentTokenCount) {
-          uiTelemetryService.setLastCachedContentTokenCount(
+          (
+            this.telemetryService ?? uiTelemetryService
+          ).setLastCachedContentTokenCount(
             usageMetadata.cachedContentTokenCount,
           );
         }