diff --git a/src/database.rs b/src/database.rs
index 45d9771..e640771 100644
--- a/src/database.rs
+++ b/src/database.rs
@@ -30,7 +30,7 @@ fn get_epubs_from_database(tx: &Transaction) -> Vec<BookEntry> {
         r#"
     SELECT books.id, folders.name, files.filename, books.firstauthor,
       books.author, genres.name, first_author_letter, series
-      FROM books_impl books JOIN files
+      FROM books_impl books JOIN files, storages
         ON books.id = files.book_id
         JOIN folders
           ON folders.id = files.folder_id
@@ -38,7 +38,7 @@ fn get_epubs_from_database(tx: &Transaction) -> Vec<BookEntry> {
           ON books.id = btg.bookid
         LEFT OUTER JOIN genres
           ON genres.id = btg.genreid
-      WHERE files.storageid = 1 AND {}.ext = 'epub'
+      WHERE files.storageid IN (SELECT storages.id WHERE storages.type = 1) AND {}.ext = 'epub'
       ORDER BY books.id"#,
         &books_or_files
     );