diff --git a/server/aws-lsp-codewhisperer/src/language-server/agenticChat/tools/executeBash.ts b/server/aws-lsp-codewhisperer/src/language-server/agenticChat/tools/executeBash.ts
index 79d6e57f3f..ded4c1fa7b 100644
--- a/server/aws-lsp-codewhisperer/src/language-server/agenticChat/tools/executeBash.ts
+++ b/server/aws-lsp-codewhisperer/src/language-server/agenticChat/tools/executeBash.ts
@@ -557,7 +557,10 @@ export class ExecuteBash {
 
     private static handleChunk(chunk: string, buffer: string[], writer?: WritableStreamDefaultWriter<any>) {
         try {
-            void writer?.write(chunk)
+            // Trim trailing newlines from the chunk before writing
+            const trimmedChunk = chunk.replace(/\r?\n$/, '')
+            void writer?.write(trimmedChunk)
+
             const lines = chunk.split(/\r?\n/)
             for (const line of lines) {
                 buffer.push(line)