Fix conversation agent fallback (home-assistant#139421)

iprak · Feb 27, 2025 · 744a7a0 · 744a7a0
1 parent f677b91
commit 744a7a0
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/homeassistant/components/assist_pipeline/pipeline.py b/homeassistant/components/assist_pipeline/pipeline.py
@@ -1103,12 +1103,16 @@ async def recognize_intent(
                 ) & conversation.ConversationEntityFeature.CONTROL:
                     intent_filter = _async_local_fallback_intent_filter
 
-                # Try local intents first, if preferred.
-                elif self.pipeline.prefer_local_intents and (
-                    intent_response := await conversation.async_handle_intents(
-                        self.hass,
-                        user_input,
-                        intent_filter=intent_filter,
+                # Try local intents
+                if (
+                    intent_response is None
+                    and self.pipeline.prefer_local_intents
+                    and (
+                        intent_response := await conversation.async_handle_intents(
+                            self.hass,
+                            user_input,
+                            intent_filter=intent_filter,
+                        )
                     )
                 ):
                     # Local intent matched