diff --git a/main/manager-api/src/main/java/xiaozhi/modules/agent/service/impl/AgentServiceImpl.java b/main/manager-api/src/main/java/xiaozhi/modules/agent/service/impl/AgentServiceImpl.java
index 3556877d..a888f8d9 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/agent/service/impl/AgentServiceImpl.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/agent/service/impl/AgentServiceImpl.java
@@ -395,7 +395,22 @@ public class AgentServiceImpl extends BaseServiceImpl<AgentDao, AgentEntity> imp
             entity.setIntentModelId(template.getIntentModelId());
             entity.setSystemPrompt(template.getSystemPrompt());
             entity.setSummaryMemory(template.getSummaryMemory());
-            entity.setChatHistoryConf(template.getChatHistoryConf());
+
+            // 根据记忆模型类型设置默认的chatHistoryConf值
+            if (template.getMemModelId() != null) {
+                if (template.getMemModelId().equals("Memory_mem0ai")
+                        || template.getMemModelId().equals("Memory_mem_local_short")) {
+                    // 当记忆模型是Memory_mem0ai或Memory_mem_local_short时，默认chatHistoryConf设为2
+                    entity.setChatHistoryConf(2);
+                } else if (template.getMemModelId().equals("Memory_nomem")) {
+                    entity.setChatHistoryConf(0);
+                } else {
+                    entity.setChatHistoryConf(template.getChatHistoryConf());
+                }
+            } else {
+                entity.setChatHistoryConf(template.getChatHistoryConf());
+            }
+
             entity.setLangCode(template.getLangCode());
             entity.setLanguage(template.getLanguage());
         }
diff --git a/main/manager-web/src/views/roleConfig.vue b/main/manager-web/src/views/roleConfig.vue
index e7b593e2..9d833e59 100644
--- a/main/manager-web/src/views/roleConfig.vue
+++ b/main/manager-web/src/views/roleConfig.vue
@@ -604,15 +604,14 @@ export default {
       if (type === "Intent" && value !== "Intent_nointent") {
         this.fetchAllFunctions();
       }
-      if (type === "Memory" && value === "Memory_nomem") {
-        this.form.chatHistoryConf = 0;
-      }
-      if (
-        type === "Memory" &&
-        value !== "Memory_nomem" &&
-        (this.form.chatHistoryConf === 0 || this.form.chatHistoryConf === null)
-      ) {
-        this.form.chatHistoryConf = 2;
+      if (type === "Memory") {
+        if (value === "Memory_nomem") {
+          this.form.chatHistoryConf = 0;
+        } else if (value === "Memory_mem0ai" || value === "Memory_mem_local_short") {
+          this.form.chatHistoryConf = 2;
+        } else if (this.form.chatHistoryConf === 0 || this.form.chatHistoryConf === null) {
+          this.form.chatHistoryConf = 2;
+        }
       }
       if (type === "LLM") {
         // 当LLM类型改变时，更新意图识别选项的可见性