diff --git a/app/assets/javascripts/views/notes/notes_view.ts b/app/assets/javascripts/views/notes/notes_view.ts
index 5e007e925..65b006e63 100644
--- a/app/assets/javascripts/views/notes/notes_view.ts
+++ b/app/assets/javascripts/views/notes/notes_view.ts
@@ -379,7 +379,7 @@ class NotesViewCtrl extends PureViewCtrl<{}, NotesState> {
   }
 
   async handleEditorChange() {
-    const activeNote = this.appState.getActiveEditor().note;
+    const activeNote = this.appState.getActiveEditor()?.note;
     if (activeNote && activeNote.conflictOf) {
       this.application!.changeAndSaveItem(activeNote.uuid, (mutator) => {
         mutator.conflictOf = undefined;