diff --git a/src/providers/twitch/twitchchannel.cpp b/src/providers/twitch/twitchchannel.cpp
index 2ba9a5de2..2853092a4 100644
--- a/src/providers/twitch/twitchchannel.cpp
+++ b/src/providers/twitch/twitchchannel.cpp
@@ -232,6 +232,7 @@ void TwitchChannel::addJoinedUser(const QString &user)
 
             this->addMessage(messages::Message::createSystemMessage("Users joined: " +
                                                                     this->joinedUsers.join(", ")));
+            this->joinedUsers.clear();
             this->joinedUsersMergeQueued = false;
         });
     }
@@ -258,6 +259,7 @@ void TwitchChannel::addPartedUser(const QString &user)
 
             this->addMessage(messages::Message::createSystemMessage("Users parted: " +
                                                                     this->partedUsers.join(", ")));
+            this->partedUsers.clear();
 
             this->partedUsersMergeQueued = false;
         });
diff --git a/src/widgets/settingspages/behaviourpage.cpp b/src/widgets/settingspages/behaviourpage.cpp
index 94d0bc371..30d754d0f 100644
--- a/src/widgets/settingspages/behaviourpage.cpp
+++ b/src/widgets/settingspages/behaviourpage.cpp
@@ -34,10 +34,12 @@ BehaviourPage::BehaviourPage()
     {
         form->addRow("Window:", this->createCheckBox(WINDOW_TOPMOST, app->settings->windowTopMost));
         form->addRow("Messages:", this->createCheckBox(INPUT_EMPTY, app->settings->hideEmptyInput));
-        form->addRow("", this->createCheckBox("Show which users joined the channel",
-                                              app->settings->showJoins));
-        form->addRow("", this->createCheckBox("Show which users parted the channel",
-                                              app->settings->showParts));
+        form->addRow(
+            "", this->createCheckBox("Show which users joined the channel (up to 1000 chatters)",
+                                     app->settings->showJoins));
+        form->addRow(
+            "", this->createCheckBox("Show which users parted the channel (up to 1000 chatters)",
+                                     app->settings->showParts));
         form->addRow("Pause chat:",
                      this->createCheckBox(PAUSE_HOVERING, app->settings->pauseChatHover));