diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0aec2b95d..669562570 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -51,6 +51,8 @@ This is a major release, and it might be not compatible with your current usage
 
 -   `<Modal />`:
     -   Add 'nopan', 'nowheel' and 'nodrag' classes to Modal's overlay classes in order to always prevent react-flow to react to drag and pan actions in modals.
+-   `<CodeAutocompleteField />`:
+    -   In multiline mode, validation errors might be highlighted incorrectly (relative line offset added).
 
 ### Changed
 
diff --git a/src/components/AutoSuggestion/AutoSuggestion.tsx b/src/components/AutoSuggestion/AutoSuggestion.tsx
index 3649db899..d23bd9e0b 100644
--- a/src/components/AutoSuggestion/AutoSuggestion.tsx
+++ b/src/components/AutoSuggestion/AutoSuggestion.tsx
@@ -317,12 +317,11 @@ const AutoSuggestion = ({
             };
             if (parseError) {
                 const { message, start, end } = parseError;
-                const { toOffset, fromOffset } = getOffsetRange(cm, start, end);
                 clearCurrentErrorMarker();
                 const { from, to } = markText({
                     view: cm,
-                    from: fromOffset,
-                    to: toOffset,
+                    from: start,
+                    to: end,
                     className: `${eccgui}-autosuggestion__text--highlighted-error`,
                     title: message,
                 });