diff --git a/api/core/memory/token_buffer_memory.py b/api/core/memory/token_buffer_memory.py
index 4f4f5045f5..f38175020c 100644
--- a/api/core/memory/token_buffer_memory.py
+++ b/api/core/memory/token_buffer_memory.py
@@ -36,9 +36,11 @@ class TokenBufferMemory:
         ).order_by(Message.created_at.desc())
 
         if message_limit and message_limit > 0:
-            messages = query.limit(message_limit).all()
+            message_limit = message_limit if message_limit <= 500 else 500
         else:
-            messages = query.all()
+            message_limit = 500
+
+        messages = query.limit(message_limit).all()
 
         messages = list(reversed(messages))
         message_file_parser = MessageFileParser(