diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/ViewPagerActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/ViewPagerActivity.kt
index 0dc77ed6c..1e456721b 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/ViewPagerActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/ViewPagerActivity.kt
@@ -375,7 +375,7 @@ class ViewPagerActivity : SimpleActivity(), ViewPager.OnPageChangeListener, View
                         else -> TYPE_IMAGES
                     }
 
-                    val isFavorite = mediumDao.isFavorite(mPath)
+                    val isFavorite = galleryDB.FavoritesDAO().isFavorite(mPath)
                     val duration = if (type == TYPE_VIDEOS) mPath.getVideoDuration() else 0
                     val ts = System.currentTimeMillis()
                     val medium = Medium(null, mPath.getFilenameFromPath(), mPath, mPath.getParentPath(), ts, ts, File(mPath).length(), type, duration, isFavorite, 0)
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/Context.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/Context.kt
index 552b47339..b21e4a390 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/Context.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/extensions/Context.kt
@@ -827,7 +827,7 @@ fun Context.addPathToDB(path: String) {
 
         try {
             val mediumDao = galleryDB.MediumDao()
-            val isFavorite = mediumDao.isFavorite(path)
+            val isFavorite = galleryDB.FavoritesDAO().isFavorite(path)
             val videoDuration = if (type == TYPE_VIDEOS) path.getVideoDuration() else 0
             val medium = Medium(null, path.getFilenameFromPath(), path, path.getParentPath(), System.currentTimeMillis(), System.currentTimeMillis(),
                     File(path).length(), type, videoDuration, isFavorite, 0L)
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/interfaces/FavoritesDAO.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/interfaces/FavoritesDAO.kt
index 1d80c3e80..d1fa0856e 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/interfaces/FavoritesDAO.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/interfaces/FavoritesDAO.kt
@@ -1,8 +1,10 @@
 package com.simplemobiletools.gallery.pro.interfaces
 
 import androidx.room.Dao
+import androidx.room.Query
 
 @Dao
 interface FavoritesDAO {
-
+    @Query("SELECT id FROM favorites WHERE full_path = :path COLLATE NOCASE")
+    fun isFavorite(path: String): Boolean
 }
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/interfaces/MediumDao.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/interfaces/MediumDao.kt
index 490bd62f4..1ce2bb641 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/interfaces/MediumDao.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/interfaces/MediumDao.kt
@@ -21,9 +21,6 @@ interface MediumDao {
     @Query("SELECT filename, full_path, parent_path, last_modified, date_taken, size, type, video_duration, is_favorite, deleted_ts FROM media WHERE deleted_ts != 0")
     fun getDeletedMedia(): List<Medium>
 
-    @Query("SELECT is_favorite FROM media WHERE full_path = :path COLLATE NOCASE")
-    fun isFavorite(path: String): Boolean
-
     @Insert(onConflict = REPLACE)
     fun insert(medium: Medium)