diff --git a/web_src/js/bootstrap.js b/web_src/js/bootstrap.js
index b5db398545..54b7c62887 100644
--- a/web_src/js/bootstrap.js
+++ b/web_src/js/bootstrap.js
@@ -26,9 +26,6 @@ function processWindowErrorEvent(e) {
     return; // ignore such nonsense error event
   }
 
-  // Wait for upstream fix: https://github.com/microsoft/monaco-editor/issues/2962
-  if (e.message.includes('Language id "vs.editor.nullLanguage" is not configured nor known')) return;
-
   showGlobalErrorMessage(`JavaScript error: ${e.message} (${e.filename} @ ${e.lineno}:${e.colno}). Open browser console to see more details.`);
 }
 
diff --git a/web_src/js/features/codeeditor.js b/web_src/js/features/codeeditor.js
index 0366afc2c0..23a26ba2b0 100644
--- a/web_src/js/features/codeeditor.js
+++ b/web_src/js/features/codeeditor.js
@@ -99,6 +99,10 @@ export async function createMonaco(textarea, filename, editorOpts) {
     }
   });
 
+  // Quick fix: https://github.com/microsoft/monaco-editor/issues/2962
+  monaco.languages.register({id: 'vs.editor.nullLanguage'});
+  monaco.languages.setLanguageConfiguration('vs.editor.nullLanguage', {});
+
   const editor = monaco.editor.create(container, {
     value: textarea.value,
     theme: 'gitea',