diff --git a/data/src/main/sqldelight/tachiyomi/data/excluded_scanlators.sq b/data/src/main/sqldelight/tachiyomi/data/excluded_scanlators.sq
index 37ed6489e..aced54fb2 100644
--- a/data/src/main/sqldelight/tachiyomi/data/excluded_scanlators.sq
+++ b/data/src/main/sqldelight/tachiyomi/data/excluded_scanlators.sq
@@ -5,8 +5,7 @@ CREATE TABLE excluded_scanlators(
     ON DELETE CASCADE
 );
 
-CREATE INDEX excluded_scanlators_manga_id_index ON excluded_scanlators(manga_id);
-CREATE INDEX idx_excluded_scanlators_scanlator ON excluded_scanlators(scanlator);
+CREATE INDEX idx_excluded_scanlators_manga_id_scanlator ON excluded_scanlators(manga_id, scanlator);
 
 insert:
 INSERT INTO excluded_scanlators(manga_id, scanlator)
diff --git a/data/src/main/sqldelight/tachiyomi/data/history.sq b/data/src/main/sqldelight/tachiyomi/data/history.sq
index 569f44967..8677577f4 100644
--- a/data/src/main/sqldelight/tachiyomi/data/history.sq
+++ b/data/src/main/sqldelight/tachiyomi/data/history.sq
@@ -10,7 +10,7 @@ CREATE TABLE history(
 );
 
 CREATE INDEX history_history_chapter_id_index ON history(chapter_id);
-CREATE INDEX idx_history_last_read ON history(last_read);
+CREATE INDEX idx_history_last_read ON history(last_read) WHERE last_read > 0;
 
 getHistoryByMangaId:
 SELECT
diff --git a/data/src/main/sqldelight/tachiyomi/data/manga_sync.sq b/data/src/main/sqldelight/tachiyomi/data/manga_sync.sq
index d14b7125c..44fa0570b 100644
--- a/data/src/main/sqldelight/tachiyomi/data/manga_sync.sq
+++ b/data/src/main/sqldelight/tachiyomi/data/manga_sync.sq
@@ -20,8 +20,6 @@ CREATE TABLE manga_sync(
     ON DELETE CASCADE
 );
 
-CREATE INDEX idx_manga_sync_manga_id ON manga_sync(manga_id);
-
 delete:
 DELETE FROM manga_sync
 WHERE manga_id = :mangaId AND sync_id = :syncId;
diff --git a/data/src/main/sqldelight/tachiyomi/migrations/45.sqm b/data/src/main/sqldelight/tachiyomi/migrations/45.sqm
index bdeb188fc..2614232b4 100644
--- a/data/src/main/sqldelight/tachiyomi/migrations/45.sqm
+++ b/data/src/main/sqldelight/tachiyomi/migrations/45.sqm
@@ -4,6 +4,6 @@ CREATE INDEX IF NOT EXISTS idx_mangas_source ON mangas(source);
 CREATE INDEX IF NOT EXISTS idx_chapters_url ON chapters(url);
 CREATE INDEX IF NOT EXISTS idx_mangas_categories_manga_id ON mangas_categories(manga_id);
 CREATE INDEX IF NOT EXISTS idx_mangas_categories_category_id ON mangas_categories(category_id);
-CREATE INDEX IF NOT EXISTS idx_excluded_scanlators_scanlator ON excluded_scanlators(scanlator);
-CREATE INDEX IF NOT EXISTS idx_manga_sync_manga_id ON manga_sync(manga_id);
-CREATE INDEX IF NOT EXISTS idx_history_last_read ON history(last_read);
+DROP INDEX IF EXISTS excluded_scanlators_manga_id_index;
+CREATE INDEX IF NOT EXISTS idx_excluded_scanlators_manga_id_scanlator ON excluded_scanlators(manga_id, scanlator);
+CREATE INDEX IF NOT EXISTS idx_history_last_read ON history(last_read) WHERE last_read > 0;