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 5bd57540f..6925cf5d0 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
@@ -544,10 +544,15 @@ public Map<Long, Long> getIdMap(long accountId) {
     public void toggleFavoriteAndSync(Account account, Note note) {
         executor.submit(() -> {
             try {
+                final var noteWithContent = getNoteById(note.getId());
+                if (noteWithContent == null) {
+                    return;
+                }
+
                 final var ssoAccount = AccountImporter.getSingleSignOnAccount(context, account.getAccountName());
                 final var notesAPI = apiProvider.getNotesAPI(context, ssoAccount, getPreferredApiVersion(account.getApiVersion()));
-                note.setFavorite(!note.getFavorite());
-                final var result = notesAPI.updateNote(note);
+                noteWithContent.setFavorite(!noteWithContent.getFavorite());
+                final var result = notesAPI.updateNote(noteWithContent);
                 final var response = result.execute();
                 if (response.isSuccessful()) {
                     final var updatedNote = response.body();