diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesRepository.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesRepository.java
index f25c91e00..3ec18b6b0 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesRepository.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesRepository.java
@@ -521,7 +521,8 @@ public LiveData<Note> addNoteAndSync(Account account, Note note) {
     public Note addNote(long accountId, @NonNull Note note) {
         note.setAccountId(accountId);
         note.setExcerpt(generateNoteExcerpt(note.getContent(), note.getTitle()));
-        return db.getNoteDao().getNoteById(db.getNoteDao().addNote(note));
+        note.setId(db.getNoteDao().addNote(note));
+        return note;
     }
 
     @MainThread