diff --git a/ElectronClient/gui/NoteEditor/NoteEditor.tsx b/ElectronClient/gui/NoteEditor/NoteEditor.tsx
index 47f3246e2..b9badf698 100644
--- a/ElectronClient/gui/NoteEditor/NoteEditor.tsx
+++ b/ElectronClient/gui/NoteEditor/NoteEditor.tsx
@@ -514,7 +514,7 @@ function NoteEditor(props: NoteEditorProps) {
 		);
 	}
 
-	if (formNote.encryption_applied || !formNote.id) {
+	if (formNote.encryption_applied || !formNote.id || !props.noteId) {
 		return renderNoNotes(styles.root);
 	}