diff --git a/app/agent/__init__.py b/app/agent/__init__.py
index 43f9b946..1d95a9c4 100644
--- a/app/agent/__init__.py
+++ b/app/agent/__init__.py
@@ -469,7 +469,7 @@ class MoviePilotAgent:
             api_key=settings.LLM_API_KEY,
             base_url=settings.LLM_BASE_URL,
             base_url_preset=settings.LLM_BASE_URL_PRESET,
-            user_agent=getattr(settings, "LLM_USER_AGENT", None),
+            user_agent=settings.LLM_USER_AGENT,
             thinking_level=None,
         )
         selected_event = await eventmanager.async_send_event(
@@ -500,7 +500,7 @@ class MoviePilotAgent:
         )
         user_agent = (
                 self._clean_optional_text(self._get_event_value(resolved_data, "user_agent"))
-                or getattr(settings, "LLM_USER_AGENT", None)
+                or settings.LLM_USER_AGENT
         )
         thinking_level = self._clean_optional_text(
             self._get_event_value(resolved_data, "thinking_level")
diff --git a/app/agent/llm/helper.py b/app/agent/llm/helper.py
index 06115982..5e7e44eb 100644
--- a/app/agent/llm/helper.py
+++ b/app/agent/llm/helper.py
@@ -724,9 +724,7 @@ class LLMHelper:
         base_url_preset_value = (
             base_url_preset if base_url_preset is not None else settings.LLM_BASE_URL_PRESET
         )
-        user_agent_value = (
-            user_agent if user_agent is not None else getattr(settings, "LLM_USER_AGENT", None)
-        )
+        user_agent_value = user_agent if user_agent is not None else settings.LLM_USER_AGENT
         normalized_thinking_level = cls._resolve_thinking_level(
             thinking_level=thinking_level,
         )
diff --git a/app/api/endpoints/llm.py b/app/api/endpoints/llm.py
index de6df61d..c5490f1f 100644
--- a/app/api/endpoints/llm.py
+++ b/app/api/endpoints/llm.py
@@ -249,7 +249,7 @@ async def llm_test(
         api_key=settings.LLM_API_KEY,
         base_url=settings.LLM_BASE_URL,
         base_url_preset=settings.LLM_BASE_URL_PRESET,
-        user_agent=getattr(settings, "LLM_USER_AGENT", None),
+        user_agent=settings.LLM_USER_AGENT,
     )
 
     if not payload.provider:
diff --git a/tests/test_system_llm_test.py b/tests/test_system_llm_test.py
index bccc400b..14ed960f 100644
--- a/tests/test_system_llm_test.py
+++ b/tests/test_system_llm_test.py
@@ -146,7 +146,7 @@ class LlmTestEndpointTest(unittest.TestCase):
         ), patch.object(
             system_endpoint.settings, "LLM_BASE_URL_PRESET", "deepseek-default"
         ), patch.object(
-            system_endpoint.settings, "LLM_USER_AGENT", "MoviePilot-Test/1.0", create=True
+            system_endpoint.settings, "LLM_USER_AGENT", "MoviePilot-Test/1.0"
         ), patch.object(
             system_endpoint.LLMHelper,
             "test_current_settings",