diff --git a/feature/bookmarks/impl/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/impl/BookmarksViewModel.kt b/feature/bookmarks/impl/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/impl/BookmarksViewModel.kt
index c1aa19a92..80c920c21 100644
--- a/feature/bookmarks/impl/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/impl/BookmarksViewModel.kt
+++ b/feature/bookmarks/impl/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/impl/BookmarksViewModel.kt
@@ -98,8 +98,8 @@ class BookmarksViewModel @Inject constructor(
             lastRemovedBookmarkId?.let {
                 userDataRepository.setNewsResourceBookmarked(it, true)
             }
+            clearUndoState()
         }
-        clearUndoState()
     }
 
     fun clearUndoState() {
@@ -136,8 +136,8 @@ class BookmarksViewModel @Inject constructor(
                     userDataRepository.setBookmarkNote(id, note)
                 }
             }
+            clearBulkUndoState()
         }
-        clearBulkUndoState()
     }
 
     fun clearBulkUndoState() {