diff --git a/src/drive/drive_monitor/mod.rs b/src/drive/drive_monitor/mod.rs
index 4104925b..d347ae44 100644
--- a/src/drive/drive_monitor/mod.rs
+++ b/src/drive/drive_monitor/mod.rs
@@ -127,6 +127,104 @@ impl DriveMonitor {
         Ok(())
     }
 
+    /// Get the path to the file states JSON file for this bot
+    fn file_state_path(&self) -> PathBuf {
+        self.work_root
+            .join(format!("{}", self.bot_id))
+            .join("file_states.json")
+    }
+
+    /// Static helper to save file states (used by background tasks)
+    async fn save_file_states_static(
+        file_states: &Arc<tokio::sync::RwLock<HashMap<String, FileState>>>,
+        work_root: &PathBuf,
+        bot_id: &uuid::Uuid,
+    ) -> Result<(), Box<dyn Error + Send + Sync>> {
+        let path = work_root
+            .join(format!("{}", bot_id))
+            .join("file_states.json");
+
+        if let Some(parent) = path.parent() {
+            if let Err(e) = tokio_fs::create_dir_all(parent).await {
+                warn!(
+                    "[DRIVE_MONITOR] Failed to create directory for file states: {} - {}",
+                    parent.display(),
+                    e
+                );
+            }
+        }
+
+        let states = file_states.read().await;
+        match serde_json::to_string_pretty(&*states) {
+            Ok(content) => {
+                if let Err(e) = tokio_fs::write(&path, content).await {
+                    warn!(
+                        "[DRIVE_MONITOR] Failed to save file states to {}: {}",
+                        path.display(),
+                        e
+                    );
+                } else {
+                    debug!(
+                        "[DRIVE_MONITOR] Saved {} file states to disk for bot {}",
+                        states.len(),
+                        bot_id
+                    );
+                }
+            }
+            Err(e) => {
+                warn!(
+                    "[DRIVE_MONITOR] Failed to serialize file states: {}",
+                    e
+                );
+            }
+        }
+        Ok(())
+    }
+
+    /// Load file states from disk to avoid reprocessing unchanged files
+    async fn load_file_states(&self) -> Result<(), Box<dyn Error + Send + Sync>> {
+        let path = self.file_state_path();
+        if path.exists() {
+            match tokio_fs::read_to_string(&path).await {
+                Ok(content) => {
+                    match serde_json::from_str::<HashMap<String, FileState>>(&content) {
+                        Ok(states) => {
+                            let mut file_states = self.file_states.write().await;
+                            let count = states.len();
+                            *file_states = states;
+                            trace!(
+                                "[DRIVE_MONITOR] Loaded {} file states from disk for bot {}",
+                                count,
+                                self.bot_id
+                            );
+                        }
+                        Err(e) => {
+                            warn!(
+                                "[DRIVE_MONITOR] Failed to parse file states from {}: {}. Starting with empty state.",
+                                path.display(),
+                                e
+                            );
+                        }
+                    }
+                }
+                Err(e) => {
+                    warn!(
+                        "[DRIVE_MONITOR] Failed to read file states from {}: {}. Starting with empty state.",
+                        path.display(),
+                        e
+                    );
+                }
+            }
+        } else {
+            debug!(
+                "[DRIVE_MONITOR] No existing file states found at {} for bot {}. Starting fresh.",
+                path.display(),
+                self.bot_id
+            );
+        }
+        Ok(())
+    }
+
     /// Save file states to disk after updates
     async fn save_file_states(&self) -> Result<(), Box<dyn Error + Send + Sync>> {
         let path = self.file_state_path();
@@ -528,9 +626,12 @@ impl DriveMonitor {
             file_states.insert(path, state);
         }
         // Save file states to disk in background to avoid blocking
-        let self_clone = Arc::new(self.clone());
+        // Use static helper to avoid double Arc (fixes "dispatch failure" error)
+        let file_states_clone = Arc::clone(&self.file_states);
+        let work_root_clone = self.work_root.clone();
+        let bot_id_clone = self.bot_id;
         tokio::spawn(async move {
-            if let Err(e) = self_clone.save_file_states().await {
+            if let Err(e) = Self::save_file_states_static(&file_states_clone, &work_root_clone, &bot_id_clone).await {
                 warn!("Failed to save file states: {}", e);
             }
         });
@@ -1300,9 +1401,12 @@ impl DriveMonitor {
         }
 
         // Save file states to disk in background to avoid blocking
-        let self_clone = Arc::new(self.clone());
+        // Use static helper to avoid double Arc (fixes "dispatch failure" error)
+        let file_states_clone = Arc::clone(&self.file_states);
+        let work_root_clone = self.work_root.clone();
+        let bot_id_clone = self.bot_id;
         tokio::spawn(async move {
-            if let Err(e) = self_clone.save_file_states().await {
+            if let Err(e) = Self::save_file_states_static(&file_states_clone, &work_root_clone, &bot_id_clone).await {
                 warn!("Failed to save file states: {}", e);
             }
         });