diff --git a/src/EmailEditor.tsx b/src/EmailEditor.tsx
index 52316273e..7bb64591c 100644
--- a/src/EmailEditor.tsx
+++ b/src/EmailEditor.tsx
@@ -3,6 +3,7 @@ import React, {
   useState,
   useImperativeHandle,
   useMemo,
+  useRef,
 } from 'react';
 import type { DisplayMode, UnlayerEditor } from '@unlayer/types';
 
@@ -51,9 +52,14 @@ function EmailEditorInner<TDisplayMode extends DisplayMode | undefined = 'email'
       [editor]
     );
 
+    // Keep a ref to the latest editor so the unmount cleanup below doesn't
+    // capture the initial (null) state.
+    const editorRef = useRef(editor);
+    editorRef.current = editor;
+
     useEffect(() => {
       return () => {
-        editor?.destroy();
+        editorRef.current?.destroy();
       };
     }, []);
 
@@ -93,7 +99,7 @@ function EmailEditorInner<TDisplayMode extends DisplayMode | undefined = 'email'
           onReady(editor);
         });
       }
-    }, [editor, Object.keys(methodProps).join(',')]);
+    }, [editor, methodProps.join(',')]);
 
     return (
       <div
diff --git a/test/destroy.test.tsx b/test/destroy.test.tsx
new file mode 100644
index 000000000..77676aac2
--- /dev/null
+++ b/test/destroy.test.tsx
@@ -0,0 +1,23 @@
+import React from 'react';
+import { render } from '@testing-library/react';
+import Editor from '../src';
+
+jest.mock('../src/loadScript', () => ({
+  loadScript: (callback: Function) => callback(),
+}));
+
+it('destroys the editor on unmount', () => {
+  const destroy = jest.fn();
+  (global as any).unlayer = {
+    createEditor: jest.fn(() => ({
+      destroy,
+      addEventListener: jest.fn(),
+      removeEventListener: jest.fn(),
+    })),
+  };
+
+  const { unmount } = render(<Editor editorId="destroy-test-editor" />);
+  unmount();
+
+  expect(destroy).toHaveBeenCalledTimes(1);
+});
diff --git a/test/quickUnmount.test.tsx b/test/quickUnmount.test.tsx
new file mode 100644
index 000000000..7615c929f
--- /dev/null
+++ b/test/quickUnmount.test.tsx
@@ -0,0 +1,25 @@
+import React from 'react';
+import { render, act } from '@testing-library/react';
+import Editor from '../src';
+
+let scriptLoadedCallback: Function;
+jest.mock('../src/loadScript', () => ({
+  loadScript: (callback: Function) => {
+    scriptLoadedCallback = callback;
+  },
+}));
+
+it('does not create the editor when unmounted before the embed script loads', () => {
+  const createEditor = jest.fn();
+  (global as any).unlayer = { createEditor };
+
+  const { unmount } = render(<Editor editorId="quick-unmount-editor" />);
+  unmount();
+
+  // Embed script finishes loading after the component is gone.
+  act(() => {
+    scriptLoadedCallback();
+  });
+
+  expect(createEditor).not.toHaveBeenCalled();
+});