diff --git a/packages/gpt.gblib/services/ChatServices.ts b/packages/gpt.gblib/services/ChatServices.ts
index 954b2edf..43458e4d 100644
--- a/packages/gpt.gblib/services/ChatServices.ts
+++ b/packages/gpt.gblib/services/ChatServices.ts
@@ -266,12 +266,14 @@ export class ChatServices {
 
     let memory;
     if (user && !this.memoryMap[user.userSystemId]) {
-      this.memoryMap[user.userSystemId] = new BufferWindowMemory({
+      memory = new BufferWindowMemory({
         returnMessages: true,
         memoryKey: 'chat_history',
         inputKey: 'input',
         k: 2
       });  
+
+      this.memoryMap[user.userSystemId] = memory;
     }
     else
     {