diff --git a/src/screens/Compose/Compose.tsx b/src/screens/Compose/Compose.tsx
index 5adad205..ab2cf005 100644
--- a/src/screens/Compose/Compose.tsx
+++ b/src/screens/Compose/Compose.tsx
@@ -339,13 +339,13 @@ export const Compose = (): JSX.Element => {
 
     return () => {
       mounted = false;
-      removeEditorNoteValueChangeObserver;
+      removeEditorNoteValueChangeObserver &&
+        removeEditorNoteValueChangeObserver();
     };
   }, [
     editor,
     editorComponent,
     note,
-    note?.locked,
     showAllChangesSavedStatus,
     showSavingStatus,
   ]);