diff --git a/src/database.rs b/src/database.rs
index c3f90dd..af131c7 100644
--- a/src/database.rs
+++ b/src/database.rs
@@ -245,6 +245,7 @@ fn clean_database(db: &Arc<RwLock<Database>>, file_path: &Path) {
     info!("Cleaned database. Removed {removed_entries} expired entries. Removed {removed_files} no longer referenced files.");
 
     database.save();
+    drop(database); // Just to be sure
 }
 
 /// A loop to clean the database periodically.
diff --git a/src/main.rs b/src/main.rs
index 444052c..e303df3 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -147,7 +147,6 @@ async fn handle_upload(
     std::fs::rename(temp_filename, settings.file_dir.join(file_hash.to_string()))?;
 
     db.write().unwrap().insert(&file_mmid, constructed_file.clone());
-    db.write().unwrap().save();
 
     Ok(Json(ClientResponse {
         status: true,