diff --git a/packages/amazonq/src/app/inline/EditRendering/displayImage.ts b/packages/amazonq/src/app/inline/EditRendering/displayImage.ts
index 0793f5460a1..300d877257b 100644
--- a/packages/amazonq/src/app/inline/EditRendering/displayImage.ts
+++ b/packages/amazonq/src/app/inline/EditRendering/displayImage.ts
@@ -324,7 +324,8 @@ export async function displaySvgDecoration(
                 isInlineEdit: true,
             }
             languageClient.sendNotification('aws/logInlineCompletionSessionResults', params)
-            if (inlineCompletionProvider) {
+            // Only auto trigger on acceptance if there is a nextToken
+            if (inlineCompletionProvider && session.editsStreakPartialResultToken) {
                 await inlineCompletionProvider.provideInlineCompletionItems(
                     editor.document,
                     endPosition,