diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/EHentai.kt b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/EHentai.kt
index 0e129d95f..38ad64c9b 100755
--- a/app/src/main/java/eu/kanade/tachiyomi/source/online/all/EHentai.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/source/online/all/EHentai.kt
@@ -6,8 +6,6 @@ import android.graphics.BitmapFactory
 import android.net.Uri
 import androidx.core.net.toUri
 import eu.kanade.domain.UnsortedPreferences
-import eu.kanade.tachiyomi.data.database.models.Manga
-import eu.kanade.tachiyomi.data.database.models.MangaImpl
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.asObservableSuccess
 import eu.kanade.tachiyomi.network.await
@@ -123,7 +121,7 @@ class EHentai(
     /**
      * Gallery list entry
      */
-    data class ParsedManga(val fav: Int, val manga: Manga, val metadata: EHentaiSearchMetadata)
+    data class ParsedManga(val fav: Int, val manga: SManga, val metadata: EHentaiSearchMetadata)
 
     private fun extendedGenericMangaParse(doc: Document) = with(doc) {
         // Parse mangas (supports compact + extended layout)
@@ -145,9 +143,8 @@ class EHentai(
                 fav = FAVORITES_BORDER_HEX_COLORS.indexOf(
                     favElement?.attr("style")?.substring(14, 17),
                 ),
-                manga = MangaImpl().apply {
+                manga = SManga.create().apply {
                     // Get title
-                    source = this@EHentai.id
                     title = thumbnailElement.attr("title")
                     url = EHentaiSearchMetadata.normalizeUrl(linkElement.attr("href"))
                     // Get image
diff --git a/app/src/main/java/exh/favorites/LocalFavoritesStorage.kt b/app/src/main/java/exh/favorites/LocalFavoritesStorage.kt
index c54c8d425..44f2de5c4 100644
--- a/app/src/main/java/exh/favorites/LocalFavoritesStorage.kt
+++ b/app/src/main/java/exh/favorites/LocalFavoritesStorage.kt
@@ -7,10 +7,11 @@ import eu.kanade.domain.manga.interactor.GetFavoriteEntries
 import eu.kanade.domain.manga.interactor.GetFavorites
 import eu.kanade.domain.manga.interactor.InsertFavoriteEntries
 import eu.kanade.domain.manga.model.Manga
-import eu.kanade.tachiyomi.data.database.models.toDomainManga
+import eu.kanade.domain.manga.model.toDomainManga
 import eu.kanade.tachiyomi.source.online.all.EHentai
 import exh.favorites.sql.models.FavoriteEntry
 import exh.metadata.metadata.EHentaiSearchMetadata
+import exh.source.EXH_SOURCE_ID
 import exh.source.isEhBasedManga
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.asFlow
@@ -36,11 +37,10 @@ class LocalFavoritesStorage {
     suspend fun getChangedRemoteEntries(entries: List<EHentai.ParsedManga>) = entries
         .asFlow()
         .map {
-            it.fav to it.manga.apply {
-                id = -1
-                favorite = true
-                date_added = System.currentTimeMillis()
-            }.toDomainManga()!!
+            it.fav to it.manga.toDomainManga(EXH_SOURCE_ID).copy(
+                favorite = true,
+                dateAdded = System.currentTimeMillis(),
+            )
         }
         .parseToFavoriteEntries()
         .getChangedEntries()