diff --git a/src/platform/packages/private/kbn-esql-editor/src/esql_editor.tsx b/src/platform/packages/private/kbn-esql-editor/src/esql_editor.tsx
index eb3da01abd505..628bab839bdb9 100644
--- a/src/platform/packages/private/kbn-esql-editor/src/esql_editor.tsx
+++ b/src/platform/packages/private/kbn-esql-editor/src/esql_editor.tsx
@@ -169,25 +169,25 @@ export const ESQLEditor = memo(function ESQLEditor({
     const currentSelection = editor1?.current?.getSelection();
     const startLineNumber = currentSelection?.startLineNumber;
     const endLineNumber = currentSelection?.endLineNumber;
+    const edits = [];
     if (startLineNumber && endLineNumber) {
       for (let lineNumber = startLineNumber; lineNumber <= endLineNumber; lineNumber++) {
         const lineContent = editorModel.current?.getLineContent(lineNumber) ?? '';
         const hasComment = lineContent?.startsWith('//');
         const commentedLine = hasComment ? lineContent?.replace('//', '') : `//${lineContent}`;
 
-        // executeEdits allows to keep edit in history
-        editor1.current?.executeEdits('comment', [
-          {
-            range: {
-              startLineNumber: lineNumber,
-              startColumn: 0,
-              endLineNumber: lineNumber,
-              endColumn: (lineContent?.length ?? 0) + 1,
-            },
-            text: commentedLine,
+        edits.push({
+          range: {
+            startLineNumber: lineNumber,
+            startColumn: 0,
+            endLineNumber: lineNumber,
+            endColumn: (lineContent?.length ?? 0) + 1,
           },
-        ]);
+          text: commentedLine,
+        });
       }
+      // executeEdits allows to keep edit in history
+      editor1.current?.executeEdits('comment', edits);
     }
   }, []);