diff --git a/package-lock.json b/package-lock.json
index 49301cde2..d1dd80e29 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13,7 +13,7 @@
         "@codemirror/commands": "6.11.0",
         "@codemirror/lang-python": "^6.1.6",
         "@codemirror/language": "^6.10.1",
-        "@codemirror/state": "^6.4.1",
+        "@codemirror/state": "6.7.1",
         "@codemirror/view": "^6.26.3",
         "@microbit/microbit-connection": "^1.0.0",
         "@microbit/microbit-fs": "^0.10.0",
@@ -1906,9 +1906,9 @@
       }
     },
     "node_modules/@codemirror/state": {
-      "version": "6.7.2",
-      "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.7.2.tgz",
-      "integrity": "sha512-U3RiPX62Wl/Gx4ftQ7UxLlloSfsFTQqKa+7vFBYteZGCzkp6oBqcsD7iSwniWRGobCAmDcwZSY+Six3+3ztdfg==",
+      "version": "6.7.1",
+      "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.7.1.tgz",
+      "integrity": "sha512-9QzNDgE4EYDnAHfrTlR2lwiPciiOymLtwKK+8yHQzCc7GXhAP9xdEbEJFy2IWB1j9UGUl9BsgMmTo/ImA02T7A==",
       "license": "MIT",
       "dependencies": {
         "@marijn/find-cluster-break": "^1.0.0"
diff --git a/package.json b/package.json
index e46e02e8a..86b722668 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
     "@codemirror/commands": "6.11.0",
     "@codemirror/lang-python": "^6.1.6",
     "@codemirror/language": "^6.10.1",
-    "@codemirror/state": "^6.4.1",
+    "@codemirror/state": "6.7.1",
     "@codemirror/view": "^6.26.3",
     "@microbit/microbit-connection": "^1.0.0",
     "@microbit/microbit-fs": "^0.10.0",
diff --git a/renovate.json b/renovate.json
index a99fb3a85..71cc963b7 100644
--- a/renovate.json
+++ b/renovate.json
@@ -1,4 +1,11 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": ["github>microbit-foundation/renovate"]
+  "extends": ["github>microbit-foundation/renovate"],
+  "packageRules": [
+    {
+      "description": "@codemirror/state 6.7.2 crashes the editor when lint diagnostics are mapped through a change that collapses a widget and a mark onto the same position. Pinned to 6.7.1 until a fixed release lands. See PYTHON-EDITOR-NEXT-3SK.",
+      "matchPackageNames": ["@codemirror/state"],
+      "allowedVersions": "!/^6\\.7\\.2$/"
+    }
+  ]
 }