diff --git a/web/app/components/workflow/nodes/llm/components/memory-system/hooks.ts b/web/app/components/workflow/nodes/llm/components/memory-system/hooks.ts
index 593280b531..afd242da3d 100644
--- a/web/app/components/workflow/nodes/llm/components/memory-system/hooks.ts
+++ b/web/app/components/workflow/nodes/llm/components/memory-system/hooks.ts
@@ -14,7 +14,7 @@ export const useMemory = (
   id: string,
   data: LLMNodeType,
 ) => {
-  const { memory = {} as Memory } = data
+  const { memory } = data
   const initCollapsed = useMemo(() => {
     if (!memory?.enabled)
       return true
@@ -74,16 +74,19 @@ export const useMemory = (
   }, [handleNodeDataUpdate])
 
   const memoryType = useMemo(() => {
-    if (memory?.enabled) {
+    if (!memory)
+      return 'disabled'
+
+    if (!('enabled' in memory))
+      return 'linear'
+
+    if (memory.enabled) {
       if (memory.mode === 'linear')
         return 'linear'
       if (memory.mode === 'block')
         return 'block'
     }
     else {
-      if (memory?.window?.enabled)
-        return 'linear'
-
       return 'disabled'
     }
   }, [memory])
diff --git a/web/app/components/workflow/nodes/llm/components/memory-system/index.tsx b/web/app/components/workflow/nodes/llm/components/memory-system/index.tsx
index 3ab14758a5..91ee802d08 100644
--- a/web/app/components/workflow/nodes/llm/components/memory-system/index.tsx
+++ b/web/app/components/workflow/nodes/llm/components/memory-system/index.tsx
@@ -14,6 +14,7 @@ import LinearMemory from './linear-memory'
 import type { Memory } from '@/app/components/workflow/types'
 import type { LLMNodeType } from '../../types'
 import { useMemory } from './hooks'
+import Split from '@/app/components/workflow/nodes/_base/components/split'
 
 type MemoryProps = Pick<Node, 'id' | 'data'> & {
   readonly?: boolean
@@ -37,7 +38,7 @@ const MemorySystem = ({
 
   return (
     <>
-      <div className='py-4'>
+      <div className=''>
         <Collapse
           disabled={!memory?.enabled}
           collapsed={collapsed}
@@ -83,6 +84,7 @@ const MemorySystem = ({
             }
           </>
         </Collapse>
+        <Split className='mt-4' />
       </div>
     </>
   )
diff --git a/web/app/components/workflow/nodes/llm/components/memory-system/memory-create-button.tsx b/web/app/components/workflow/nodes/llm/components/memory-system/memory-create-button.tsx
index 4236791710..b55fae28ea 100644
--- a/web/app/components/workflow/nodes/llm/components/memory-system/memory-create-button.tsx
+++ b/web/app/components/workflow/nodes/llm/components/memory-system/memory-create-button.tsx
@@ -41,11 +41,7 @@ const MemoryCreateButton = () => {
       <PortalToFollowElem
         open={open}
         onOpenChange={setOpen}
-        placement='left-start'
-        offset={{
-          mainAxis: 128,
-          alignmentAxis: -48,
-        }}
+        placement='left'
       >
         <PortalToFollowElemTrigger onClick={() => setOpen(v => !v)}>
           <ActionButton className='shrink-0'>
diff --git a/web/app/components/workflow/nodes/llm/panel.tsx b/web/app/components/workflow/nodes/llm/panel.tsx
index 3bb9e2cba7..c39f7386c3 100644
--- a/web/app/components/workflow/nodes/llm/panel.tsx
+++ b/web/app/components/workflow/nodes/llm/panel.tsx
@@ -172,7 +172,7 @@ const Panel: FC<NodePanelProps<LLMNodeType>> = ({
         )}
 
         {/* Memory put place examples. */}
-        {isChatMode && isChatModel && !!inputs.memory && (
+        {isChatMode && isChatModel && !!inputs.memory?.enabled && (
           <div className='mt-4'>
             <div className='flex h-8 items-center justify-between rounded-lg bg-components-input-bg-normal pl-3 pr-2'>
               <div className='flex items-center space-x-1'>
@@ -218,7 +218,6 @@ const Panel: FC<NodePanelProps<LLMNodeType>> = ({
         {/* Memory */}
         {isChatMode && (
           <>
-            <Split />
             <MemorySystem
               id={id}
               data={data}