diff --git a/CHANGELOG.md b/CHANGELOG.md
index 39668a2..c44553f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+
+- Failing to start a search will no longer cause the search task to exit when
+  using the local server, which would result in no more searches being able to
+  be executed
+
 ## [0.20.0-alpha.9]
 
 ### Added
diff --git a/distant-local/src/api/state/search.rs b/distant-local/src/api/state/search.rs
index 2c6f118..1e4887c 100644
--- a/distant-local/src/api/state/search.rs
+++ b/distant-local/src/api/state/search.rs
@@ -137,7 +137,11 @@ async fn search_task(tx: mpsc::Sender<InnerSearchMsg>, mut rx: mpsc::Receiver<In
                     Ok(executor) => executor,
                     Err(x) => {
                         let _ = cb.send(Err(x));
-                        return;
+
+                        // NOTE: We do not want to exit our task! This processes all of our search
+                        //       requests, so if we exit, things have gone terrible. This is just a
+                        //       regular error, so we merely continue to wait for the next request.
+                        continue;
                     }
                 };