diff --git a/app/Http/Livewire/Chat/HighscoreChat.php b/app/Http/Livewire/Chat/HighscoreChat.php
index 2a4060f8..e811228a 100644
--- a/app/Http/Livewire/Chat/HighscoreChat.php
+++ b/app/Http/Livewire/Chat/HighscoreChat.php
@@ -48,7 +48,7 @@ class HighscoreChat extends Component
     public function sendMessage()
     {
         $this->validate();
-        $newMessages = collect($this->messages)
+        $newMessages = collect(cache()->get('highscore_chat_messages', []))
             ->push([
                 'fromId'   => auth()->id(),
                 'fromName' => str(auth()->user()->name)->limit(2),
@@ -56,6 +56,7 @@ class HighscoreChat extends Component
                 'message'  => $this->myNewMessage,
                 'time'     => now()->asDateTime(),
             ])
+            ->take(-21)
             ->toArray();
         cache()->set('highscore_chat_messages', $newMessages);
         event(new ChatMessageSentEvent());
diff --git a/resources/lang/de.json b/resources/lang/de.json
index 0f2b96d6..88974c66 100644
--- a/resources/lang/de.json
+++ b/resources/lang/de.json
@@ -671,6 +671,6 @@
     "Parent": "Übergeordnet",
     "PlebChat": "",
     "Close panel": "Schließe Panel",
-    "This chat is limited by 100 messages.": "Dieser Chat ist auf 100 Nachrichten begrenzt. Die ältesten Nachrichten werden gelöscht und die Nachrichten werden nicht gespeichert. (nur im RAM des Servers)",
+    "This chat is limited by 21 messages.": "Dieser Chat ist auf 21 Nachrichten begrenzt. Die ältesten Nachrichten werden gelöscht und die Nachrichten werden nicht gespeichert. (nur im RAM des Servers)",
     "Send": "Senden"
 }
diff --git a/resources/lang/en.json b/resources/lang/en.json
index d9bd5ff3..8e666f7b 100644
--- a/resources/lang/en.json
+++ b/resources/lang/en.json
@@ -665,6 +665,6 @@
     "Parent": "",
     "PlebChat": "",
     "Close panel": "",
-    "This chat is limited by 100 messages.": "",
+    "This chat is limited by 21 messages.": "",
     "Send": ""
-}
\ No newline at end of file
+}
diff --git a/resources/lang/es.json b/resources/lang/es.json
index 644fde6b..fa702457 100644
--- a/resources/lang/es.json
+++ b/resources/lang/es.json
@@ -666,5 +666,6 @@
     "PlebChat": "",
     "Close panel": "",
     "This chat is limited by 100 messages.": "",
-    "Send": ""
+    "Send": "",
+    "This chat is limited by 21 messages.": ""
 }
\ No newline at end of file
diff --git a/resources/lang/fr.json b/resources/lang/fr.json
index 2661abc5..b00544c6 100644
--- a/resources/lang/fr.json
+++ b/resources/lang/fr.json
@@ -666,5 +666,6 @@
     "PlebChat": "",
     "Close panel": "",
     "This chat is limited by 100 messages.": "",
-    "Send": ""
+    "Send": "",
+    "This chat is limited by 21 messages.": ""
 }
\ No newline at end of file
diff --git a/resources/lang/hr.json b/resources/lang/hr.json
index e8e1d76d..307b1230 100644
--- a/resources/lang/hr.json
+++ b/resources/lang/hr.json
@@ -666,5 +666,6 @@
     "PlebChat": "",
     "Close panel": "",
     "This chat is limited by 100 messages.": "",
-    "Send": ""
+    "Send": "",
+    "This chat is limited by 21 messages.": ""
 }
\ No newline at end of file
diff --git a/resources/lang/it.json b/resources/lang/it.json
index f0fe0a62..2fad5de3 100644
--- a/resources/lang/it.json
+++ b/resources/lang/it.json
@@ -666,5 +666,6 @@
     "PlebChat": "",
     "Close panel": "",
     "This chat is limited by 100 messages.": "",
-    "Send": ""
+    "Send": "",
+    "This chat is limited by 21 messages.": ""
 }
\ No newline at end of file
diff --git a/resources/lang/mk.json b/resources/lang/mk.json
index e9c8f01f..aa105cda 100644
--- a/resources/lang/mk.json
+++ b/resources/lang/mk.json
@@ -666,5 +666,6 @@
     "PlebChat": "",
     "Close panel": "",
     "This chat is limited by 100 messages.": "",
-    "Send": ""
+    "Send": "",
+    "This chat is limited by 21 messages.": ""
 }
\ No newline at end of file
diff --git a/resources/lang/pl.json b/resources/lang/pl.json
index 937de176..8c7ae881 100644
--- a/resources/lang/pl.json
+++ b/resources/lang/pl.json
@@ -666,5 +666,6 @@
     "PlebChat": "",
     "Close panel": "",
     "This chat is limited by 100 messages.": "",
-    "Send": ""
+    "Send": "",
+    "This chat is limited by 21 messages.": ""
 }
\ No newline at end of file
diff --git a/resources/lang/pt.json b/resources/lang/pt.json
index 864348a0..a70315d4 100644
--- a/resources/lang/pt.json
+++ b/resources/lang/pt.json
@@ -666,5 +666,6 @@
     "PlebChat": "",
     "Close panel": "",
     "This chat is limited by 100 messages.": "",
-    "Send": ""
+    "Send": "",
+    "This chat is limited by 21 messages.": ""
 }
\ No newline at end of file
diff --git a/resources/lang/tr.json b/resources/lang/tr.json
index f21e162d..4305bbb7 100644
--- a/resources/lang/tr.json
+++ b/resources/lang/tr.json
@@ -640,5 +640,6 @@
     "PlebChat": "",
     "Close panel": "",
     "This chat is limited by 100 messages.": "",
-    "Send": ""
+    "Send": "",
+    "This chat is limited by 21 messages.": ""
 }
\ No newline at end of file
diff --git a/resources/views/livewire/chat/highscore-chat.blade.php b/resources/views/livewire/chat/highscore-chat.blade.php
index dc83611b..b06fb82a 100644
--- a/resources/views/livewire/chat/highscore-chat.blade.php
+++ b/resources/views/livewire/chat/highscore-chat.blade.php
@@ -33,7 +33,7 @@
                             </div>
                             <div class="mt-1">
                                 <p class="text-sm text-gray-900">
-                                    {{ __('This chat is limited by 100 messages.') }}
+                                    {{ __('This chat is limited by 21 messages.') }}
                                 </p>
                             </div>
                         </div>