diff --git a/packages/grafana-ui/src/components/Monaco/CodeEditor.tsx b/packages/grafana-ui/src/components/Monaco/CodeEditor.tsx
index b29cd124119..0402aa53c2f 100644
--- a/packages/grafana-ui/src/components/Monaco/CodeEditor.tsx
+++ b/packages/grafana-ui/src/components/Monaco/CodeEditor.tsx
@@ -111,9 +111,12 @@ class UnthemedCodeEditor extends PureComponent<Props> {
 
     const languagePromise = this.loadCustomLanguage();
 
+    if (onChange) {
+      editor.getModel()?.onDidChangeContent(() => onChange(editor.getValue()));
+    }
+
     if (onEditorDidMount) {
       languagePromise.then(() => onEditorDidMount(editor, monaco));
-      editor.getModel()?.onDidChangeContent(() => onChange?.(editor.getValue()));
     }
   };