diff --git a/pmocache/src/db.rs b/pmocache/src/db.rs
index e73ca2a5..cf00bf77 100644
--- a/pmocache/src/db.rs
+++ b/pmocache/src/db.rs
@@ -192,20 +192,24 @@ impl DB {
         collection: Option<&str>,
         metadata: Option<&Value>,
     ) -> rusqlite::Result<()> {
-        let conn = self.lock_conn("add_with_metadata");
+        // Bloc pour limiter la durée du lock
+        {
+            let conn = self.lock_conn("add_with_metadata");
 
-        conn.execute(
-            "INSERT INTO asset (pk, id, collection, hits, last_used)
-             VALUES (?1, ?2, ?3, 0, ?4)
-             ON CONFLICT(pk) DO UPDATE SET
-                 id = excluded.id,
-                 collection = excluded.collection,
-                 last_used = excluded.last_used",
-            params![pk, id, collection, Utc::now().to_rfc3339()],
-        )?;
+            conn.execute(
+                "INSERT INTO asset (pk, id, collection, hits, last_used)
+                 VALUES (?1, ?2, ?3, 0, ?4)
+                 ON CONFLICT(pk) DO UPDATE SET
+                     id = excluded.id,
+                     collection = excluded.collection,
+                     last_used = excluded.last_used",
+                params![pk, id, collection, Utc::now().to_rfc3339()],
+            )?;
+        } // Lock libéré ici
 
-        if metadata.is_some() {
-            self.set_metadata(pk, metadata.unwrap())?
+        // Appeler set_metadata après avoir libéré le lock pour éviter un deadlock
+        if let Some(metadata) = metadata {
+            self.set_metadata(pk, metadata)?;
         }
 
         Ok(())
diff --git a/pmocache/tests/test_db.rs b/pmocache/tests/test_db.rs
index c4b4a046..1066e7a2 100644
--- a/pmocache/tests/test_db.rs
+++ b/pmocache/tests/test_db.rs
@@ -43,7 +43,6 @@ fn test_add_and_get() {
 }
 
 #[test]
-#[ignore] // Test trop lent, à investiguer
 fn test_add_with_metadata() {
     let (_temp_dir, db) = create_test_db();