diff --git a/src/public/app/services/note_create.js b/src/public/app/services/note_create.js
index d6e5e4475..a57e5c69f 100644
--- a/src/public/app/services/note_create.js
+++ b/src/public/app/services/note_create.js
@@ -49,6 +49,8 @@ async function createNote(parentNoteId, options = {}) {
         window.cutToNote.removeSelection();
     }
 
+    await ws.waitForMaxKnownSyncId();
+
     if (options.activate) {
         const activeTabContext = appContext.tabManager.getActiveTabContext();
         await activeTabContext.setNote(note.noteId);
@@ -62,7 +64,7 @@ async function createNote(parentNoteId, options = {}) {
     }
 
     const noteEntity = await treeCache.getNote(note.noteId);
-    const branchEntity = treeCache.getBranchId(branch.branchId);
+    const branchEntity = treeCache.getBranch(branch.branchId);
 
     return {
         note: noteEntity,
diff --git a/src/public/app/widgets/type_widgets/editable_text.js b/src/public/app/widgets/type_widgets/editable_text.js
index 89d2239ef..7c0ebd3df 100644
--- a/src/public/app/widgets/type_widgets/editable_text.js
+++ b/src/public/app/widgets/type_widgets/editable_text.js
@@ -126,9 +126,7 @@ export default class EditableTextTypeWidget extends AbstractTextTypeWidget {
         const noteComplement = await treeCache.getNoteComplement(note.noteId);
 
         await this.spacedUpdate.allowUpdateWithoutChange(() => {
-            if (noteComplement.content) {
-                this.textEditor.setData(noteComplement.content);
-            }
+            this.textEditor.setData(noteComplement.content || "");
         });
     }