diff --git a/packages/core/src/codewhisperer/commands/invokeRecommendation.ts b/packages/core/src/codewhisperer/commands/invokeRecommendation.ts
index 37fcb965774..1a3a6a2c1f8 100644
--- a/packages/core/src/codewhisperer/commands/invokeRecommendation.ts
+++ b/packages/core/src/codewhisperer/commands/invokeRecommendation.ts
@@ -20,6 +20,9 @@ export async function invokeRecommendation(
     client: DefaultCodeWhispererClient,
     config: ConfigurationEntry
 ) {
+    // Call report user decisions once to report recommendations leftover from last invocation.
+    RecommendationHandler.instance.reportUserDecisions(-1)
+
     if (!editor || !config.isManualTriggerEnabled) {
         return
     }
diff --git a/packages/core/src/codewhisperer/service/inlineCompletionService.ts b/packages/core/src/codewhisperer/service/inlineCompletionService.ts
index 18a7c014b6a..f982fa6d3c7 100644
--- a/packages/core/src/codewhisperer/service/inlineCompletionService.ts
+++ b/packages/core/src/codewhisperer/service/inlineCompletionService.ts
@@ -88,8 +88,6 @@ export class InlineCompletionService {
             }
         }
 
-        // Call report user decisions once to report recommendations leftover from last invocation.
-        RecommendationHandler.instance.reportUserDecisions(-1)
         TelemetryHelper.instance.setInvokeSuggestionStartTime()
         ClassifierTrigger.instance.recordClassifierResultForAutoTrigger(editor, autoTriggerType, event)
 
diff --git a/packages/core/src/codewhisperer/service/keyStrokeHandler.ts b/packages/core/src/codewhisperer/service/keyStrokeHandler.ts
index 49ef633a98f..9e7e92ade34 100644
--- a/packages/core/src/codewhisperer/service/keyStrokeHandler.ts
+++ b/packages/core/src/codewhisperer/service/keyStrokeHandler.ts
@@ -87,6 +87,9 @@ export class KeyStrokeHandler {
         client: DefaultCodeWhispererClient,
         config: ConfigurationEntry
     ): Promise<void> {
+        // Call report user decisions once to report recommendations leftover from last invocation.
+        RecommendationHandler.instance.reportUserDecisions(-1)
+
         try {
             if (!config.isAutomatedTriggerEnabled) {
                 return