diff --git a/api/core/app/apps/agent_chat/app_config_manager.py b/api/core/app/apps/agent_chat/app_config_manager.py
index 57214f924a..232211c18b 100644
--- a/api/core/app/apps/agent_chat/app_config_manager.py
+++ b/api/core/app/apps/agent_chat/app_config_manager.py
@@ -52,7 +52,7 @@ class AgentChatAppConfigManager(BaseAppConfigManager):
         else:
             config_from = EasyUIBasedAppModelConfigFrom.APP_LATEST_CONFIG
 
-        if override_config_dict != EasyUIBasedAppModelConfigFrom.ARGS:
+        if config_from != EasyUIBasedAppModelConfigFrom.ARGS:
             app_model_config_dict = app_model_config.to_dict()
             config_dict = app_model_config_dict.copy()
         else:
diff --git a/api/core/app/apps/completion/app_config_manager.py b/api/core/app/apps/completion/app_config_manager.py
index a82e68a337..b98a4c16aa 100644
--- a/api/core/app/apps/completion/app_config_manager.py
+++ b/api/core/app/apps/completion/app_config_manager.py
@@ -37,7 +37,7 @@ class CompletionAppConfigManager(BaseAppConfigManager):
         else:
             config_from = EasyUIBasedAppModelConfigFrom.APP_LATEST_CONFIG
 
-        if override_config_dict != EasyUIBasedAppModelConfigFrom.ARGS:
+        if config_from != EasyUIBasedAppModelConfigFrom.ARGS:
             app_model_config_dict = app_model_config.to_dict()
             config_dict = app_model_config_dict.copy()
         else:
diff --git a/api/services/completion_service.py b/api/services/completion_service.py
index 4e3c4e19f6..eb31ccbb3b 100644
--- a/api/services/completion_service.py
+++ b/api/services/completion_service.py
@@ -30,16 +30,16 @@ class CompletionService:
                 invoke_from=invoke_from,
                 stream=streaming
             )
-        elif app_model.mode == AppMode.CHAT.value:
-            return ChatAppGenerator().generate(
+        elif app_model.mode == AppMode.AGENT_CHAT.value or app_model.is_agent:
+            return AgentChatAppGenerator().generate(
                 app_model=app_model,
                 user=user,
                 args=args,
                 invoke_from=invoke_from,
                 stream=streaming
             )
-        elif app_model.mode == AppMode.AGENT_CHAT.value:
-            return AgentChatAppGenerator().generate(
+        elif app_model.mode == AppMode.CHAT.value:
+            return ChatAppGenerator().generate(
                 app_model=app_model,
                 user=user,
                 args=args,