diff --git a/src/service/media.rs b/src/service/media.rs
index 74cc0f12..b9ccddae 100644
--- a/src/service/media.rs
+++ b/src/service/media.rs
@@ -99,7 +99,7 @@ impl Service {
         &self,
         mxc: OwnedMxcUri,
     ) -> Result<Option<(FileMeta, Vec<u8>)>> {
-        if let Ok(Some((meta, key))) = self.db.search_file_metadata(mxc, 0, 0) {
+        if let Some((meta, key)) = self.db.search_file_metadata(mxc, 0, 0)? {
             let path = services().globals.get_media_file(&key);
             let mut file_data = Vec::new();
             let Ok(mut file) = File::open(path).await else {
@@ -298,8 +298,8 @@ impl Service {
         let (width, height, crop) =
             Self::thumbnail_properties(width, height).unwrap_or((0, 0, false));
 
-        if let Ok(Some((meta, key))) =
-            self.db.search_file_metadata(mxc.clone(), width, height)
+        if let Some((meta, key)) =
+            self.db.search_file_metadata(mxc.clone(), width, height)?
         {
             debug!("Using saved thumbnail");
             let path = services().globals.get_media_file(&key);
@@ -309,8 +309,8 @@ impl Service {
             return Ok(Some((meta, file.clone())));
         }
 
-        let Ok(Some((meta, key))) =
-            self.db.search_file_metadata(mxc.clone(), 0, 0)
+        let Some((meta, key)) =
+            self.db.search_file_metadata(mxc.clone(), 0, 0)?
         else {
             debug!("Original image not found, can't generate thumbnail");
             return Ok(None);