diff --git a/files/routes/chat.py b/files/routes/chat.py
index 5e67c0956..425f20d45 100644
--- a/files/routes/chat.py
+++ b/files/routes/chat.py
@@ -40,7 +40,7 @@ if "load_chat" in sys.argv or SITE == 'localhost':
 		}
 
 		messages.append(data)
-		messages = messages[:500]
+		messages = messages[-500:]
 		emit('speak', data, broadcast=True)
 		return '', 204