diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt
index fe2641501..1ba7c9985 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt
@@ -322,7 +322,7 @@ class ReaderPresenter(
             ReaderChapterItem(
                 it.chapter,
                 manga!!,
-                it.chapter == currentChapter?.chapter,
+                it.chapter.id == currentChapter?.chapter?.id,
                 context,
                 preferences.dateFormat(),
                 decimalFormat
@@ -585,10 +585,10 @@ class ReaderPresenter(
     }
 
     // SY -->
-    fun toggleBookmark(chapter: Chapter) {
-        chapter.bookmark = !chapter.bookmark
+    fun toggleBookmark(chapterId: Long, bookmarked: Boolean) {
+        val chapter = chapterList.find { it.chapter.id == chapterId }?.chapter ?: return
+        chapter.bookmark = bookmarked
         db.updateChapterProgress(chapter).executeAsBlocking()
-        chapterList.firstOrNull { it.chapter.id == chapter.id }?.let { it.chapter.bookmark == !chapter.bookmark }
     }
     // SY <--
 
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/chapter/ReaderChapterDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/chapter/ReaderChapterDialog.kt
index 4e56e9cd6..a20ae4053 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/chapter/ReaderChapterDialog.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/chapter/ReaderChapterDialog.kt
@@ -69,7 +69,7 @@ class ReaderChapterDialog(private val activity: ReaderActivity) : ReaderChapterA
     }
 
     override fun bookmarkChapter(chapter: Chapter) {
-        presenter.toggleBookmark(chapter)
+        presenter.toggleBookmark(chapter.id!!, !chapter.bookmark)
         refreshList(scroll = false)
     }
 }