diff --git a/app/src/main/java/eu/kanade/domain/SYDomainModule.kt b/app/src/main/java/eu/kanade/domain/SYDomainModule.kt
index 9b81af591..c6d1226e6 100644
--- a/app/src/main/java/eu/kanade/domain/SYDomainModule.kt
+++ b/app/src/main/java/eu/kanade/domain/SYDomainModule.kt
@@ -48,11 +48,11 @@ import tachiyomi.domain.manga.interactor.GetSearchMetadata
 import tachiyomi.domain.manga.interactor.GetSearchTags
 import tachiyomi.domain.manga.interactor.GetSearchTitles
 import tachiyomi.domain.manga.interactor.InsertFavoriteEntries
+import tachiyomi.domain.manga.interactor.InsertFavoriteEntryAlternative
 import tachiyomi.domain.manga.interactor.InsertFlatMetadata
 import tachiyomi.domain.manga.interactor.InsertMergedReference
 import tachiyomi.domain.manga.interactor.SetCustomMangaInfo
 import tachiyomi.domain.manga.interactor.SetMangaFilteredScanlators
-import tachiyomi.domain.manga.interactor.InsertFavoriteEntryAlternative
 import tachiyomi.domain.manga.interactor.UpdateMergedSettings
 import tachiyomi.domain.manga.repository.CustomMangaRepository
 import tachiyomi.domain.manga.repository.FavoritesEntryRepository
diff --git a/data/src/main/java/tachiyomi/data/manga/FavoritesEntryRepositoryImpl.kt b/data/src/main/java/tachiyomi/data/manga/FavoritesEntryRepositoryImpl.kt
index 8743bd04f..e2ce6b448 100644
--- a/data/src/main/java/tachiyomi/data/manga/FavoritesEntryRepositoryImpl.kt
+++ b/data/src/main/java/tachiyomi/data/manga/FavoritesEntryRepositoryImpl.kt
@@ -44,6 +44,5 @@ class FavoritesEntryRepositoryImpl(
         } catch (e: Exception) {
             logcat(LogPriority.INFO, e)
         }
-
     }
 }
diff --git a/data/src/main/sqldelight/tachiyomi/data/eh_favorites.sq b/data/src/main/sqldelight/tachiyomi/data/eh_favorites.sq
index 90ab39ddc..689b54820 100644
--- a/data/src/main/sqldelight/tachiyomi/data/eh_favorites.sq
+++ b/data/src/main/sqldelight/tachiyomi/data/eh_favorites.sq
@@ -19,9 +19,9 @@ CREATE INDEX eh_favorites_alternatives_gid_token_index ON eh_favorites_alternati
 CREATE INDEX eh_favorites_alternatives_other_gid_token_index ON eh_favorites_alternatives(otherGid, otherToken);
 
 selectAll:
-SELECT f.gid, f.token, f.title, f.category, a.otherGid, a.otherToken
+SELECT coalesce(a.gid, f.gid), coalesce(a.token, f.token), f.title, f.category, a.otherGid, a.otherToken
 FROM eh_favorites AS f
-LEFT JOIN eh_favorites_alternatives AS a ON f.gid = a.gid AND f.token = a.token;
+LEFT JOIN eh_favorites_alternatives AS a ON (f.gid = a.gid AND f.token = a.token) OR (f.gid = a.otherGid AND f.token = a.otherToken);
 
 insertEhFavorites:
 INSERT INTO eh_favorites (title, gid, token, category) VALUES (?, ?, ?, ?);