diff --git a/src/DiffEditor/DiffEditor.js b/src/DiffEditor/DiffEditor.js
index ce483a4..f7a9317 100644
--- a/src/DiffEditor/DiffEditor.js
+++ b/src/DiffEditor/DiffEditor.js
@@ -102,7 +102,7 @@ const DiffEditor =
     !isMonacoMounting && !isEditorReady && createEditor();
   }, [isMonacoMounting, isEditorReady, createEditor]);
 
-  const removeEditor = _ => editorRef.current.dispose();
+  const removeEditor = _ => editorRef.current && editorRef.current.dispose();
 
   return (
     <section style={{ ...styles.wrapper, width, height }}>
diff --git a/src/Editor/Editor.js b/src/Editor/Editor.js
index a4c5bb9..28771b0 100644
--- a/src/Editor/Editor.js
+++ b/src/Editor/Editor.js
@@ -76,7 +76,7 @@ const Editor =
     !isMonacoMounting && !isEditorReady && createEditor();
   }, [isMonacoMounting, isEditorReady, createEditor]);
 
-  const removeEditor = _ => editorRef.current.dispose();
+  const removeEditor = _ => editorRef.current && editorRef.current.dispose();
 
   return (
     <section style={{ ...styles.wrapper, width, height }}>