diff --git a/src/public/app/services/note_context.js b/src/public/app/services/note_context.js
index ee02c0d77..d2b4b4fb5 100644
--- a/src/public/app/services/note_context.js
+++ b/src/public/app/services/note_context.js
@@ -24,6 +24,7 @@ class NoteContext extends Component {
         this.notePath = null;
         this.noteId = null;
         this.parentNoteId = null;
+        this.hoistedNoteId = 'root';
 
         this.triggerEvent('noteSwitched', {
             noteContext: this,
@@ -165,12 +166,12 @@ class NoteContext extends Component {
     }
 
     async setHoistedNoteId(noteIdToHoist) {
-        if (this.notePathArray && !this.notePathArray.includes(noteIdToHoist)) {
+        this.hoistedNoteId = noteIdToHoist;
+
+        if (!this.notePathArray?.includes(noteIdToHoist)) {
             await this.setNote(noteIdToHoist);
         }
 
-        this.hoistedNoteId = noteIdToHoist;
-
         await this.triggerEvent('hoistedNoteChanged', {
             noteId: noteIdToHoist,
             ntxId: this.ntxId