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 14ec43156..5b0a8d6d2 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
@@ -250,7 +250,7 @@ public Page createNote(Wiki noteBook,
       note.setContent(note.getContent());
       Page createdPage = createNote(noteBook, parentPage, note);
       NotePageProperties properties = note.getProperties();
-      String draftPageId = String.valueOf(properties != null && properties.isDraft() ? properties.getNoteId() : null);
+      String draftPageId = properties != null && properties.isDraft() ? String.valueOf(properties.getNoteId()) : null;
       try {
         if (properties != null) {
           properties.setNoteId(Long.parseLong(createdPage.getId()));
@@ -2375,7 +2375,7 @@ private String processImagesOnDraftUpdate(DraftPage draftPage, long userIdentity
 
   private Page processImagesOnNoteCreation(Page note, String draftId, long userIdentityId) throws WikiException {
     String newContent = note.getContent();
-    if (StringUtils.isNotEmpty(draftId) && !draftId.equals("null")) {
+    if (StringUtils.isNotEmpty(draftId)) {
       String sourceObjectType = WikiDraftPageAttachmentPlugin.OBJECT_TYPE;
       attachmentService.moveAttachments(sourceObjectType,
                                         draftId,