diff --git a/webapp/packages/supersonic-fe/src/pages/Agent/AgentForm.tsx b/webapp/packages/supersonic-fe/src/pages/Agent/AgentForm.tsx
index 65254454e..000a24d06 100644
--- a/webapp/packages/supersonic-fe/src/pages/Agent/AgentForm.tsx
+++ b/webapp/packages/supersonic-fe/src/pages/Agent/AgentForm.tsx
@@ -61,12 +61,13 @@ const AgentForm: React.FC<Props> = ({ editAgent, onSaveAgent, onCreateToolBtnCli
       }
 
       const config = jsonParse(editAgent.agentConfig, {});
-
-      form.setFieldsValue({
+      const initData = {
         ...sourceData,
         enableSearch: editAgent.enableSearch !== 0,
         agentConfig: { ...defaultAgentConfig, ...config },
-      });
+      };
+      form.setFieldsValue(initData);
+      setFormData(initData);
       if (editAgent.examples) {
         setExamples(editAgent.examples.map((question) => ({ id: uuid(), question })));
       }
@@ -220,7 +221,7 @@ const AgentForm: React.FC<Props> = ({ editAgent, onSaveAgent, onCreateToolBtnCli
         <div className={styles.agentFormContainer}>
           <FormItem name={['llmConfig', 'provider']} label="接口协议">
             <Select placeholder="">
-              {['OPEN_AI'].map((item) => (
+              {['OPEN_AI', 'OLLAMA'].map((item) => (
                 <Select.Option key={item} value={item}>
                   {item}
                 </Select.Option>
@@ -236,6 +237,7 @@ const AgentForm: React.FC<Props> = ({ editAgent, onSaveAgent, onCreateToolBtnCli
           <FormItem
             name={['llmConfig', 'apiKey']}
             label="API Key"
+            hidden={formData?.llmConfig?.provider === 'OLLAMA'}
             getValueFromEvent={(event) => {
               const value = event.target.value;
               return encryptPassword(value);
diff --git a/webapp/packages/supersonic-fe/src/pages/Agent/index.tsx b/webapp/packages/supersonic-fe/src/pages/Agent/index.tsx
index af0cdfb1e..a4b8087d1 100644
--- a/webapp/packages/supersonic-fe/src/pages/Agent/index.tsx
+++ b/webapp/packages/supersonic-fe/src/pages/Agent/index.tsx
@@ -26,17 +26,6 @@ const Agent = () => {
     const res = await getAgentList();
     setLoading(false);
     setAgents(res.data || []);
-    if (!res.data?.length) {
-      return;
-    }
-    if (currentAgent) {
-      const agent = res.data.find((item) => item.id === currentAgent.id);
-      if (agent) {
-        setCurrentAgent(agent);
-      } else {
-        setCurrentAgent(res.data[0]);
-      }
-    }
   };
 
   useEffect(() => {
@@ -54,6 +43,15 @@ const Agent = () => {
     } else {
       newAgentConfig.tools.push({ ...tool, id: uuid() });
     }
+    setAgentConfig(newAgentConfig);
+    if (!currentAgent?.id) {
+      setCurrentAgent({
+        ...currentAgent,
+        agentConfig: JSON.stringify(newAgentConfig) as any,
+      });
+      setModalVisible(false);
+      return;
+    }
     await onSaveAgent({
       ...currentAgent,
       agentConfig: JSON.stringify(newAgentConfig) as any,
@@ -62,11 +60,16 @@ const Agent = () => {
   };
 
   const onSaveAgent = async (agent: AgentType, noTip?: boolean) => {
-    await saveAgent(agent);
+    const { data, code } = await saveAgent(agent);
+    if (code === 200) {
+      setCurrentAgent({
+        ...data,
+      });
+      updateData();
+    }
     if (!noTip) {
       message.success('保存成功');
     }
-    updateData();
   };
 
   const onDeleteAgent = async (id: number) => {