diff --git a/mediarepo-api/src/tauri_plugin/custom_schemes.rs b/mediarepo-api/src/tauri_plugin/custom_schemes.rs
index 6ad31c4..a5b4bd2 100644
--- a/mediarepo-api/src/tauri_plugin/custom_schemes.rs
+++ b/mediarepo-api/src/tauri_plugin/custom_schemes.rs
@@ -8,7 +8,7 @@ pub fn register_custom_uri_schemes<R: Runtime>(builder: Builder<R>) -> Builder<R
         let resource_key = request.uri().trim_start_matches("once://");
 
         let buffer = buf_state.get_entry(resource_key);
-        buf_state.clear_expired();
+
         if let Some(buffer) = buffer {
             ResponseBuilder::new()
                 .mimetype(&buffer.mime)
diff --git a/mediarepo-api/src/tauri_plugin/mod.rs b/mediarepo-api/src/tauri_plugin/mod.rs
index 76507ee..d155002 100644
--- a/mediarepo-api/src/tauri_plugin/mod.rs
+++ b/mediarepo-api/src/tauri_plugin/mod.rs
@@ -4,6 +4,8 @@ use tauri::{AppHandle, Builder, Invoke, Manager, Runtime};
 use state::ApiState;
 
 use crate::tauri_plugin::state::{AppState, BufferState};
+use std::thread;
+use std::time::Duration;
 
 pub(crate) mod commands;
 pub mod custom_schemes;
@@ -58,7 +60,11 @@ impl<R: Runtime> Plugin<R> for MediarepoPlugin<R> {
         app.manage(api_state);
 
         let buffer_state = BufferState::default();
-        app.manage(buffer_state);
+        app.manage(buffer_state.clone());
+        thread::spawn(move || loop {
+            thread::sleep(Duration::from_secs(10));
+            buffer_state.clear_expired();
+        });
 
         let repo_state = AppState::load()?;
         app.manage(repo_state);
diff --git a/mediarepo-api/src/tauri_plugin/state.rs b/mediarepo-api/src/tauri_plugin/state.rs
index 3179f42..f73132a 100644
--- a/mediarepo-api/src/tauri_plugin/state.rs
+++ b/mediarepo-api/src/tauri_plugin/state.rs
@@ -58,7 +58,7 @@ impl VolatileBuffer {
     }
 }
 
-#[derive(Default)]
+#[derive(Default, Clone)]
 pub struct BufferState {
     pub buffer: Arc<Mutex<HashMap<String, VolatileBuffer>>>,
 }