diff --git a/core/testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/repository/TestUserDataRepository.kt b/core/testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/repository/TestUserDataRepository.kt
index df7609a54..10b666a05 100644
--- a/core/testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/repository/TestUserDataRepository.kt
+++ b/core/testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/repository/TestUserDataRepository.kt
@@ -68,8 +68,9 @@ class TestUserDataRepository : UserDataRepository {
             } else {
                 current.bookmarkedNewsResources - newsResourceId
             }
+            val notes = if (bookmarked) current.bookmarkNotes else current.bookmarkNotes - newsResourceId
 
-            _userData.tryEmit(current.copy(bookmarkedNewsResources = bookmarkedNews))
+            _userData.tryEmit(current.copy(bookmarkedNewsResources = bookmarkedNews, bookmarkNotes = notes))
         }
     }