diff --git a/src/renderer/src/components/MemoryProvider.tsx b/src/renderer/src/components/MemoryProvider.tsx
index defc213e4b..2a7f6ad91d 100644
--- a/src/renderer/src/components/MemoryProvider.tsx
+++ b/src/renderer/src/components/MemoryProvider.tsx
@@ -63,7 +63,7 @@ const MemoryProvider: FC<MemoryProviderProps> = ({ children }) => {
     }
 
     // 更新上一次的话题ID
-    previousTopicRef.current = currentTopic
+    previousTopicRef.current = currentTopic || null
   }, [currentTopic, shortMemoryActive, dispatch])
 
   return <>{children}</>
diff --git a/src/renderer/src/i18n/index.ts b/src/renderer/src/i18n/index.ts
index 04979102aa..9ecc0581cd 100644
--- a/src/renderer/src/i18n/index.ts
+++ b/src/renderer/src/i18n/index.ts
@@ -3,11 +3,11 @@ import i18n from 'i18next'
 import { initReactI18next } from 'react-i18next'
 
 // Original translation
-import enUS from './locales/en-US.json'
-import jaJP from './locales/ja-JP.json'
-import ruRU from './locales/ru-RU.json'
-import zhCN from './locales/zh-CN.json'
-import zhTW from './locales/zh-TW.json'
+import enUS from './locales/en-us.json'
+import jaJP from './locales/ja-jp.json'
+import ruRU from './locales/ru-ru.json'
+import zhCN from './locales/zh-cn.json'
+import zhTW from './locales/zh-tw.json'
 // Machine translation
 import elGR from './translate/el-gr.json'
 import esES from './translate/es-es.json'
diff --git a/src/renderer/src/i18n/locales/en-us.json b/src/renderer/src/i18n/locales/en-us.json
index 24717916ba..d4dc82786f 100644
--- a/src/renderer/src/i18n/locales/en-us.json
+++ b/src/renderer/src/i18n/locales/en-us.json
@@ -1060,7 +1060,22 @@
         "noCurrentTopic": "Please select a conversation topic first",
         "confirmDelete": "Confirm Delete",
         "confirmDeleteContent": "Are you sure you want to delete this short-term memory?",
-        "delete": "Delete"
+        "delete": "Delete",
+        "memoryLists": "[to be translated]:记忆角色",
+        "listView": "[to be translated]:列表视图",
+        "mindmapView": "[to be translated]:思维导图",
+        "centerNodeLabel": "[to be translated]:用户记忆",
+        "addList": "[to be translated]:添加记忆列表",
+        "editList": "[to be translated]:编辑记忆列表",
+        "listName": "[to be translated]:列表名称",
+        "listNamePlaceholder": "[to be translated]:输入列表名称",
+        "listDescription": "[to be translated]:列表描述",
+        "listDescriptionPlaceholder": "[to be translated]:输入列表描述（可选）",
+        "noLists": "[to be translated]:暂无记忆列表",
+        "confirmDeleteList": "[to be translated]:确认删除列表",
+        "confirmDeleteListContent": "[to be translated]:确定要删除 {{name}} 列表吗？此操作将同时删除列表中的所有记忆，且不可恢复。",
+        "toggleActive": "[to be translated]:切换激活状态",
+        "clearConfirmContentList": "[to be translated]:确定要清空 {{name}} 中的所有记忆吗？此操作不可恢复。"
       },
       "mcp": {
         "actions": "Actions",
diff --git a/src/renderer/src/i18n/locales/ja-jp.json b/src/renderer/src/i18n/locales/ja-jp.json
index d3a511151b..749542a4a2 100644
--- a/src/renderer/src/i18n/locales/ja-jp.json
+++ b/src/renderer/src/i18n/locales/ja-jp.json
@@ -1351,6 +1351,59 @@
       "privacy": {
         "title": "プライバシー設定",
         "enable_privacy_mode": "匿名エラーレポートとデータ統計の送信"
+      },
+      "memory": {
+        "title": "[to be translated]:记忆功能",
+        "description": "[to be translated]:管理AI助手的长期记忆，自动分析对话并提取重要信息",
+        "enableMemory": "[to be translated]:启用记忆功能",
+        "enableAutoAnalyze": "[to be translated]:启用自动分析",
+        "analyzeModel": "[to be translated]:分析模型",
+        "selectModel": "[to be translated]:选择模型",
+        "memoriesList": "[to be translated]:记忆列表",
+        "memoryLists": "[to be translated]:记忆角色",
+        "addMemory": "[to be translated]:添加记忆",
+        "editMemory": "[to be translated]:编辑记忆",
+        "clearAll": "[to be translated]:清空全部",
+        "noMemories": "[to be translated]:暂无记忆",
+        "memoryPlaceholder": "[to be translated]:输入要记住的内容",
+        "addSuccess": "[to be translated]:记忆添加成功",
+        "editSuccess": "[to be translated]:记忆编辑成功",
+        "deleteSuccess": "[to be translated]:记忆删除成功",
+        "clearSuccess": "[to be translated]:记忆清空成功",
+        "clearConfirmTitle": "[to be translated]:确认清空",
+        "clearConfirmContent": "[to be translated]:确定要清空所有记忆吗？此操作无法撤销。",
+        "listView": "[to be translated]:列表视图",
+        "mindmapView": "[to be translated]:思维导图",
+        "centerNodeLabel": "[to be translated]:用户记忆",
+        "manualAnalyze": "[to be translated]:手动分析",
+        "analyzeNow": "[to be translated]:立即分析",
+        "startingAnalysis": "[to be translated]:开始分析...",
+        "cannotAnalyze": "[to be translated]:无法分析，请检查设置",
+        "selectTopic": "[to be translated]:选择话题",
+        "selectTopicPlaceholder": "[to be translated]:选择要分析的话题",
+        "filterByCategory": "[to be translated]:按分类筛选",
+        "allCategories": "[to be translated]:全部",
+        "uncategorized": "[to be translated]:未分类",
+        "addList": "[to be translated]:添加记忆列表",
+        "editList": "[to be translated]:编辑记忆列表",
+        "listName": "[to be translated]:列表名称",
+        "listNamePlaceholder": "[to be translated]:输入列表名称",
+        "listDescription": "[to be translated]:列表描述",
+        "listDescriptionPlaceholder": "[to be translated]:输入列表描述（可选）",
+        "noLists": "[to be translated]:暂无记忆列表",
+        "confirmDeleteList": "[to be translated]:确认删除列表",
+        "confirmDeleteListContent": "[to be translated]:确定要删除 {{name}} 列表吗？此操作将同时删除列表中的所有记忆，且不可恢复。",
+        "toggleActive": "[to be translated]:切换激活状态",
+        "clearConfirmContentList": "[to be translated]:确定要清空 {{name}} 中的所有记忆吗？此操作不可恢复。",
+        "shortMemory": "[to be translated]:短期记忆",
+        "toggleShortMemoryActive": "[to be translated]:切换短期记忆功能",
+        "addShortMemory": "[to be translated]:添加短期记忆",
+        "addShortMemoryPlaceholder": "[to be translated]:输入短期记忆内容，只在当前对话中有效",
+        "noShortMemories": "[to be translated]:暂无短期记忆",
+        "noCurrentTopic": "[to be translated]:请先选择一个对话话题",
+        "confirmDelete": "[to be translated]:确认删除",
+        "confirmDeleteContent": "[to be translated]:确定要删除这条短期记忆吗？",
+        "delete": "[to be translated]:删除"
       }
     },
     "translate": {
@@ -1393,4 +1446,4 @@
       "visualization": "可視化"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/src/renderer/src/i18n/locales/ru-ru.json b/src/renderer/src/i18n/locales/ru-ru.json
index 72d24e7170..aa62b0fe49 100644
--- a/src/renderer/src/i18n/locales/ru-ru.json
+++ b/src/renderer/src/i18n/locales/ru-ru.json
@@ -1351,6 +1351,59 @@
       "privacy": {
         "title": "Настройки приватности",
         "enable_privacy_mode": "Анонимная отправка отчетов об ошибках и статистики"
+      },
+      "memory": {
+        "title": "[to be translated]:记忆功能",
+        "description": "[to be translated]:管理AI助手的长期记忆，自动分析对话并提取重要信息",
+        "enableMemory": "[to be translated]:启用记忆功能",
+        "enableAutoAnalyze": "[to be translated]:启用自动分析",
+        "analyzeModel": "[to be translated]:分析模型",
+        "selectModel": "[to be translated]:选择模型",
+        "memoriesList": "[to be translated]:记忆列表",
+        "memoryLists": "[to be translated]:记忆角色",
+        "addMemory": "[to be translated]:添加记忆",
+        "editMemory": "[to be translated]:编辑记忆",
+        "clearAll": "[to be translated]:清空全部",
+        "noMemories": "[to be translated]:暂无记忆",
+        "memoryPlaceholder": "[to be translated]:输入要记住的内容",
+        "addSuccess": "[to be translated]:记忆添加成功",
+        "editSuccess": "[to be translated]:记忆编辑成功",
+        "deleteSuccess": "[to be translated]:记忆删除成功",
+        "clearSuccess": "[to be translated]:记忆清空成功",
+        "clearConfirmTitle": "[to be translated]:确认清空",
+        "clearConfirmContent": "[to be translated]:确定要清空所有记忆吗？此操作无法撤销。",
+        "listView": "[to be translated]:列表视图",
+        "mindmapView": "[to be translated]:思维导图",
+        "centerNodeLabel": "[to be translated]:用户记忆",
+        "manualAnalyze": "[to be translated]:手动分析",
+        "analyzeNow": "[to be translated]:立即分析",
+        "startingAnalysis": "[to be translated]:开始分析...",
+        "cannotAnalyze": "[to be translated]:无法分析，请检查设置",
+        "selectTopic": "[to be translated]:选择话题",
+        "selectTopicPlaceholder": "[to be translated]:选择要分析的话题",
+        "filterByCategory": "[to be translated]:按分类筛选",
+        "allCategories": "[to be translated]:全部",
+        "uncategorized": "[to be translated]:未分类",
+        "addList": "[to be translated]:添加记忆列表",
+        "editList": "[to be translated]:编辑记忆列表",
+        "listName": "[to be translated]:列表名称",
+        "listNamePlaceholder": "[to be translated]:输入列表名称",
+        "listDescription": "[to be translated]:列表描述",
+        "listDescriptionPlaceholder": "[to be translated]:输入列表描述（可选）",
+        "noLists": "[to be translated]:暂无记忆列表",
+        "confirmDeleteList": "[to be translated]:确认删除列表",
+        "confirmDeleteListContent": "[to be translated]:确定要删除 {{name}} 列表吗？此操作将同时删除列表中的所有记忆，且不可恢复。",
+        "toggleActive": "[to be translated]:切换激活状态",
+        "clearConfirmContentList": "[to be translated]:确定要清空 {{name}} 中的所有记忆吗？此操作不可恢复。",
+        "shortMemory": "[to be translated]:短期记忆",
+        "toggleShortMemoryActive": "[to be translated]:切换短期记忆功能",
+        "addShortMemory": "[to be translated]:添加短期记忆",
+        "addShortMemoryPlaceholder": "[to be translated]:输入短期记忆内容，只在当前对话中有效",
+        "noShortMemories": "[to be translated]:暂无短期记忆",
+        "noCurrentTopic": "[to be translated]:请先选择一个对话话题",
+        "confirmDelete": "[to be translated]:确认删除",
+        "confirmDeleteContent": "[to be translated]:确定要删除这条短期记忆吗？",
+        "delete": "[to be translated]:删除"
       }
     },
     "translate": {
@@ -1393,4 +1446,4 @@
       "visualization": "Визуализация"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/src/renderer/src/i18n/locales/zh-tw.json b/src/renderer/src/i18n/locales/zh-tw.json
index ab094b8e63..fb5f8c6697 100644
--- a/src/renderer/src/i18n/locales/zh-tw.json
+++ b/src/renderer/src/i18n/locales/zh-tw.json
@@ -1351,6 +1351,59 @@
       "privacy": {
         "title": "隱私設定",
         "enable_privacy_mode": "匿名發送錯誤報告和資料統計"
+      },
+      "memory": {
+        "title": "[to be translated]:记忆功能",
+        "description": "[to be translated]:管理AI助手的长期记忆，自动分析对话并提取重要信息",
+        "enableMemory": "[to be translated]:启用记忆功能",
+        "enableAutoAnalyze": "[to be translated]:启用自动分析",
+        "analyzeModel": "[to be translated]:分析模型",
+        "selectModel": "[to be translated]:选择模型",
+        "memoriesList": "[to be translated]:记忆列表",
+        "memoryLists": "[to be translated]:记忆角色",
+        "addMemory": "[to be translated]:添加记忆",
+        "editMemory": "[to be translated]:编辑记忆",
+        "clearAll": "[to be translated]:清空全部",
+        "noMemories": "[to be translated]:暂无记忆",
+        "memoryPlaceholder": "[to be translated]:输入要记住的内容",
+        "addSuccess": "[to be translated]:记忆添加成功",
+        "editSuccess": "[to be translated]:记忆编辑成功",
+        "deleteSuccess": "[to be translated]:记忆删除成功",
+        "clearSuccess": "[to be translated]:记忆清空成功",
+        "clearConfirmTitle": "[to be translated]:确认清空",
+        "clearConfirmContent": "[to be translated]:确定要清空所有记忆吗？此操作无法撤销。",
+        "listView": "[to be translated]:列表视图",
+        "mindmapView": "[to be translated]:思维导图",
+        "centerNodeLabel": "[to be translated]:用户记忆",
+        "manualAnalyze": "[to be translated]:手动分析",
+        "analyzeNow": "[to be translated]:立即分析",
+        "startingAnalysis": "[to be translated]:开始分析...",
+        "cannotAnalyze": "[to be translated]:无法分析，请检查设置",
+        "selectTopic": "[to be translated]:选择话题",
+        "selectTopicPlaceholder": "[to be translated]:选择要分析的话题",
+        "filterByCategory": "[to be translated]:按分类筛选",
+        "allCategories": "[to be translated]:全部",
+        "uncategorized": "[to be translated]:未分类",
+        "addList": "[to be translated]:添加记忆列表",
+        "editList": "[to be translated]:编辑记忆列表",
+        "listName": "[to be translated]:列表名称",
+        "listNamePlaceholder": "[to be translated]:输入列表名称",
+        "listDescription": "[to be translated]:列表描述",
+        "listDescriptionPlaceholder": "[to be translated]:输入列表描述（可选）",
+        "noLists": "[to be translated]:暂无记忆列表",
+        "confirmDeleteList": "[to be translated]:确认删除列表",
+        "confirmDeleteListContent": "[to be translated]:确定要删除 {{name}} 列表吗？此操作将同时删除列表中的所有记忆，且不可恢复。",
+        "toggleActive": "[to be translated]:切换激活状态",
+        "clearConfirmContentList": "[to be translated]:确定要清空 {{name}} 中的所有记忆吗？此操作不可恢复。",
+        "shortMemory": "[to be translated]:短期记忆",
+        "toggleShortMemoryActive": "[to be translated]:切换短期记忆功能",
+        "addShortMemory": "[to be translated]:添加短期记忆",
+        "addShortMemoryPlaceholder": "[to be translated]:输入短期记忆内容，只在当前对话中有效",
+        "noShortMemories": "[to be translated]:暂无短期记忆",
+        "noCurrentTopic": "[to be translated]:请先选择一个对话话题",
+        "confirmDelete": "[to be translated]:确认删除",
+        "confirmDeleteContent": "[to be translated]:确定要删除这条短期记忆吗？",
+        "delete": "[to be translated]:删除"
       }
     },
     "translate": {
@@ -1393,4 +1446,4 @@
       "visualization": "視覺化"
     }
   }
-}
+}
\ No newline at end of file