diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/database/models/MangaChapterHistory.kt b/app/src/main/java/eu/kanade/tachiyomi/data/database/models/MangaChapterHistory.kt
index 2c5bf6665f..50e72b0470 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/database/models/MangaChapterHistory.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/database/models/MangaChapterHistory.kt
@@ -84,7 +84,7 @@ data class MangaChapterHistory(val manga: Manga, val chapter: Chapter, val histo
                     mangaId = _mangaId!!,
                     url = chapterUrl!!,
                     name = name!!,
-                    scanlator = scanlator!!,
+                    scanlator = scanlator,
                     read = read!!,
                     bookmark = bookmark!!,
                     lastPageRead = lastPageRead!!,
@@ -98,11 +98,12 @@ data class MangaChapterHistory(val manga: Manga, val chapter: Chapter, val histo
             historyId?.let {
                 History.mapper(
                     id = historyId,
-                    chapterId = historyChapterId!!,
+                    chapterId = historyChapterId ?: chapterId ?: 0L,
                     lastRead = historyLastRead,
                     timeRead = historyTimeRead,
                 )
             } ?: History.create().apply {
+                (historyChapterId ?: chapterId)?.let { chapter_id = it }
                 historyLastRead?.let { last_read = it }
                 historyTimeRead?.let { time_read = it }
             },
diff --git a/data/src/commonMain/sqldelight/tachiyomi/data/history.sq b/data/src/commonMain/sqldelight/tachiyomi/data/history.sq
index e5193906b3..dfdd0b31f6 100644
--- a/data/src/commonMain/sqldelight/tachiyomi/data/history.sq
+++ b/data/src/commonMain/sqldelight/tachiyomi/data/history.sq
@@ -67,7 +67,10 @@ SELECT * FROM (
 SELECT
     mangas.*,
     chapters.*,
-    history.*
+    history.history_id AS history_id,
+    history.history_chapter_id AS history_chapter_id,
+    history.history_last_read AS history_last_read,
+    history.history_time_read AS history_time_read
 FROM (
     SELECT mangas.*
     FROM mangas
@@ -166,24 +169,28 @@ UNION --
 SELECT * FROM (
 SELECT
     mangas.*,
-    NULL AS _id,
-    NULL AS manga_id,
-    NULL AS url,
-    NULL AS name,
-    NULL AS read,
-    NULL AS scanlator,
-    NULL AS bookmark,
-    NULL AS date_fetch,
-    NULL AS date_upload,
-    NULL AS last_page_read,
-    NULL AS pages_left,
-    NULL AS chapter_number,
-    NULL AS source_order,
+    chapters.*,
     NULL AS history_id,
     NULL AS history_chapter_id,
     mangas.date_added AS history_last_read,
     NULL AS history_time_read
 FROM mangas
+JOIN (
+    SELECT
+        NULL AS _id,
+        NULL AS manga_id,
+        NULL AS url,
+        NULL AS name,
+        NULL AS read,
+        NULL AS scanlator,
+        NULL AS bookmark,
+        NULL AS date_fetch,
+        NULL AS date_upload,
+        NULL AS last_page_read,
+        NULL AS pages_left,
+        NULL AS chapter_number,
+        NULL AS source_order
+) AS chapters
 WHERE favorite = 1
 AND lower(title) LIKE '%' || :search || '%'
 )