diff --git a/src/Shared/Components/CodeEditor/CodeEditorRenderer.tsx b/src/Shared/Components/CodeEditor/CodeEditorRenderer.tsx
index ed565e995..b8da733c7 100644
--- a/src/Shared/Components/CodeEditor/CodeEditorRenderer.tsx
+++ b/src/Shared/Components/CodeEditor/CodeEditorRenderer.tsx
@@ -248,6 +248,8 @@ export const CodeEditorRenderer = ({
         }
 
         return () => {
+            codeMirrorMergeRef.current?.destroy()
+            diffMinimapRef.current?.destroy()
             setCodeMirrorMergeInstance(null)
             setDiffMinimapInstance(null)
             codeMirrorMergeRef.current = null