diff --git a/CHANGELOG.md b/CHANGELOG.md
index 380ff4e96c..18108f6209 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -41,6 +41,7 @@
 - Fixed splash screen state only getting updates if library is empty (Should slightly reduce splash screen duration)
 - Fixed kitsu tracker issue due to domain change
 - Fixed entry custom cover won't load if entry doesn't have cover from source
+- Fixed unread badge doesn't work properly for some sources (notably Komga)
 
 ## Translation
 - Update Japanese translation (akir45)
diff --git a/data/src/commonMain/sqldelight/tachiyomi/migrations/25.sqm b/data/src/commonMain/sqldelight/tachiyomi/migrations/25.sqm
new file mode 100644
index 0000000000..3c4532ada4
--- /dev/null
+++ b/data/src/commonMain/sqldelight/tachiyomi/migrations/25.sqm
@@ -0,0 +1,14 @@
+DROP VIEW IF EXISTS scanlators_view;
+CREATE VIEW scanlators_view AS
+SELECT S.* FROM (
+    WITH RECURSIVE split(seq, _id, name, str) AS (
+        SELECT 0, mangas._id, NULL, mangas.filtered_scanlators||' [.] ' FROM mangas WHERE mangas._id
+        UNION ALL SELECT
+            seq+1,
+            _id,
+            substr(str, 0, instr(str, ' [.] ')),
+            substr(str, instr(str, ' [.] ')+5)
+        FROM split WHERE str != ''
+    )
+    SELECT _id AS manga_id, name FROM split WHERE split.seq != 0 ORDER BY split.seq ASC
+) AS S;
diff --git a/data/src/commonMain/sqldelight/tachiyomi/view/scanlators_view.sq b/data/src/commonMain/sqldelight/tachiyomi/view/scanlators_view.sq
index 98ba9e39e4..744626d74e 100644
--- a/data/src/commonMain/sqldelight/tachiyomi/view/scanlators_view.sq
+++ b/data/src/commonMain/sqldelight/tachiyomi/view/scanlators_view.sq
@@ -2,7 +2,7 @@
 CREATE VIEW scanlators_view AS
 SELECT S.* FROM (
     WITH RECURSIVE split(seq, _id, name, str) AS (
-        SELECT 0, mangas._id, NULL, ifnull(mangas.filtered_scanlators, '')||' [.] ' FROM mangas WHERE mangas._id
+        SELECT 0, mangas._id, NULL, mangas.filtered_scanlators||' [.] ' FROM mangas WHERE mangas._id
         UNION ALL SELECT
             seq+1,
             _id,