diff --git a/packages/kbn-monaco/src/esql/lib/monaco/esql_tokens_provider.ts b/packages/kbn-monaco/src/esql/lib/monaco/esql_tokens_provider.ts
index aa0234c155c336..ce521d1c9dfac2 100644
--- a/packages/kbn-monaco/src/esql/lib/monaco/esql_tokens_provider.ts
+++ b/packages/kbn-monaco/src/esql/lib/monaco/esql_tokens_provider.ts
@@ -57,7 +57,12 @@ export class ESQLTokensProvider implements monaco.languages.TokensProvider {
           const tokenTypeName = lexer.vocabulary.getSymbolicName(token.type);
 
           if (tokenTypeName) {
-            const myToken = new ESQLToken(tokenTypeName, token.startIndex, token.stopIndex);
+            const indexOffset = cleanedLine === line ? 0 : line.length - cleanedLine.length;
+            const myToken = new ESQLToken(
+              tokenTypeName,
+              token.startIndex + indexOffset,
+              token.stopIndex + indexOffset
+            );
             myTokens.push(myToken);
           }
         }