diff --git a/private_gpt/ui/ui.py b/private_gpt/ui/ui.py
index 2c1dcd3..06295e7 100644
--- a/private_gpt/ui/ui.py
+++ b/private_gpt/ui/ui.py
@@ -155,7 +155,7 @@ class PrivateGptUi:
                     )
 
             # max 20 messages to try to avoid context overflow
-            return history_messages[:20]
+            return history_messages[-20:]
 
         new_message = ChatMessage(content=message, role=MessageRole.USER)
         all_messages = [*build_history(), new_message]