diff --git a/ChatTwo/Configuration.cs b/ChatTwo/Configuration.cs
index 9c5ab7a..308c346 100755
--- a/ChatTwo/Configuration.cs
+++ b/ChatTwo/Configuration.cs
@@ -64,7 +64,7 @@ internal class Tab {
     internal void AddMessage(Message message, bool unread = true) {
         this.MessagesMutex.WaitOne();
         this.Messages.Add(message);
-        if (this.Messages.Count > 1000) {
+        while (this.Messages.Count > Store.MessagesLimit) {
             this.Messages.RemoveAt(0);
         }
 
diff --git a/ChatTwo/Store.cs b/ChatTwo/Store.cs
index 6938d88..3368930 100755
--- a/ChatTwo/Store.cs
+++ b/ChatTwo/Store.cs
@@ -9,6 +9,8 @@ using Lumina.Excel.GeneratedSheets;
 namespace ChatTwo;
 
 internal class Store : IDisposable {
+    internal const int MessagesLimit = 10_000;
+    
     internal sealed class MessagesLock : IDisposable {
         private Mutex Mutex { get; }
         internal List<Message> Messages { get; }
@@ -64,7 +66,7 @@ internal class Store : IDisposable {
         using var messages = this.GetMessages();
         messages.Messages.Add(message);
 
-        if (messages.Messages.Count > 1_000) {
+        while (messages.Messages.Count > MessagesLimit) {
             messages.Messages.RemoveAt(0);
         }