diff --git a/services/web/frontend/js/features/source-editor/extensions/cursor-highlights.ts b/services/web/frontend/js/features/source-editor/extensions/cursor-highlights.ts
index 6838535aef..7928e6dc31 100644
--- a/services/web/frontend/js/features/source-editor/extensions/cursor-highlights.ts
+++ b/services/web/frontend/js/features/source-editor/extensions/cursor-highlights.ts
@@ -1,8 +1,10 @@
 import {
+  MapMode,
   RangeSet,
   RangeValue,
   StateEffect,
   StateField,
+  Transaction,
   TransactionSpec,
 } from '@codemirror/state'
 import {
@@ -67,9 +69,15 @@ export const cursorHighlights = () => {
 }
 
 class HighlightRangeValue extends RangeValue {
+  mapMode = MapMode.Simple
+
   constructor(public highlight: Highlight) {
     super()
   }
+
+  eq(other: HighlightRangeValue) {
+    return other.highlight === this.highlight
+  }
 }
 
 const cursorHighlightsState = StateField.define<RangeSet<HighlightRangeValue>>({
@@ -101,7 +109,7 @@ const cursorHighlightsState = StateField.define<RangeSet<HighlightRangeValue>>({
       }
     }
 
-    if (tr.docChanged) {
+    if (tr.docChanged && !tr.annotation(Transaction.remote)) {
       value = value.map(tr.changes)
     }