diff --git a/src/api.ts b/src/api.ts
index 9d63db6..5e1ac67 100644
--- a/src/api.ts
+++ b/src/api.ts
@@ -44,6 +44,12 @@ export class ChatApiManager {
    */
   private initializeChatClient(settings: InlineAISettings): ChatOpenAI | ChatOllama | ChatGoogleGenerativeAI | null {
     try {
+      if (settings.messageHistory) {
+        this.messageHistory = new MessageQueue<HistoryMessage>(MESSAGE_HISTORY_LIMIT);
+      } else {
+        this.messageHistory = new MessageQueue<HistoryMessage>(0);
+      }
+      
       switch (settings.provider) {
         case "openai":
           if (!settings.apiKey) {