diff --git a/notes-service/src/main/java/org/exoplatform/wiki/service/impl/NoteServiceImpl.java b/notes-service/src/main/java/org/exoplatform/wiki/service/impl/NoteServiceImpl.java
index 6780642fe..243d40974 100644
--- a/notes-service/src/main/java/org/exoplatform/wiki/service/impl/NoteServiceImpl.java
+++ b/notes-service/src/main/java/org/exoplatform/wiki/service/impl/NoteServiceImpl.java
@@ -1117,6 +1117,7 @@ public DraftPage updateDraftForExistPage(DraftPage draftNoteToUpdate,
             && isOriginalFeaturedImage(draftNoteToUpdate, targetPage)) {
           featuredImage.setId(0L);
         }
+        properties.setNoteId(Long.parseLong(newDraftPage.getId()));
         properties = saveNoteMetadata(properties,
                                       newDraftPage.getLang(),
                                       Long.valueOf(identityManager.getOrCreateUserIdentity(username).getId()));
@@ -1153,6 +1154,7 @@ public DraftPage updateDraftForNewPage(DraftPage draftNoteToUpdate, long clientT
     newDraftPage = dataStorage.updateDraftPageForUser(newDraftPage, Utils.getCurrentUser());
     NotePageProperties properties = draftNoteToUpdate.getProperties();
     try {
+      properties.setNoteId(Long.parseLong(newDraftPage.getId()));
       properties = saveNoteMetadata(properties, newDraftPage.getLang(), userIdentityId);
     } catch (Exception e) {
       log.error("Failed to save draft note metadata", e);