diff --git a/crates/brightstaff/src/handlers/pipeline_processor.rs b/crates/brightstaff/src/handlers/pipeline_processor.rs
index c04cac96..dfa710b6 100644
--- a/crates/brightstaff/src/handlers/pipeline_processor.rs
+++ b/crates/brightstaff/src/handlers/pipeline_processor.rs
@@ -78,13 +78,13 @@ impl PipelineProcessor {
             debug!("Received response from filter agent {}", agent_name);
 
             // Parse the response content as new message history
-            chat_completions_history = serde_json::from_str(&response_content).map_err(|err| {
-                warn!(
-                    "Failed to parse response from agent {}, response: {}",
-                    agent_name, response_content
-                );
-                err
-            })?;
+            chat_completions_history =
+                serde_json::from_str(&response_content).inspect_err(|err| {
+                    warn!(
+                        "Failed to parse response from agent {}, err: {}, response: {}",
+                        agent_name, err, response_content
+                    )
+                })?;
         }
 
         Ok(chat_completions_history)
diff --git a/crates/brightstaff/src/router/llm_router.rs b/crates/brightstaff/src/router/llm_router.rs
index 243ebca7..5f71f9c8 100644
--- a/crates/brightstaff/src/router/llm_router.rs
+++ b/crates/brightstaff/src/router/llm_router.rs
@@ -79,9 +79,12 @@ impl RouterService {
         trace_parent: Option<String>,
         usage_preferences: Option<Vec<ModelUsagePreference>>,
     ) -> Result<Option<(String, String)>> {
-        if usage_preferences.is_none()
-            || usage_preferences.as_ref().unwrap().len() < 2
-            || messages.is_empty()
+        if messages.is_empty() {
+            return Ok(None);
+        }
+
+        if (usage_preferences.is_none() || usage_preferences.as_ref().unwrap().len() < 2)
+            && !self.llm_usage_defined
         {
             return Ok(None);
         }