diff --git a/app/editor/index.tsx b/app/editor/index.tsx
index 4ef5770dc..9b803369f 100644
--- a/app/editor/index.tsx
+++ b/app/editor/index.tsx
@@ -302,7 +302,7 @@ export class Editor extends React.PureComponent<
 
   public componentWillUnmount(): void {
     window.removeEventListener("theme-changed", this.dispatchThemeChanged);
-    this.view.destroy();
+    this.view?.destroy();
     this.mutationObserver?.disconnect();
   }
 
diff --git a/shared/editor/extensions/Prism.ts b/shared/editor/extensions/Prism.ts
index e81700b9b..6fcab0155 100644
--- a/shared/editor/extensions/Prism.ts
+++ b/shared/editor/extensions/Prism.ts
@@ -220,7 +220,9 @@ export default function Prism({
         // it render un-highlighted and then trigger a defered render of Prism
         // by updating the plugins metadata
         setTimeout(() => {
-          view.dispatch(view.state.tr.setMeta("prism", { loaded: true }));
+          if (!view.isDestroyed) {
+            view.dispatch(view.state.tr.setMeta("prism", { loaded: true }));
+          }
         }, 10);
       }
       return {};