diff --git a/src/providers/twitch/TwitchChannel.cpp b/src/providers/twitch/TwitchChannel.cpp
index c3a795fff..4eb494ae6 100644
--- a/src/providers/twitch/TwitchChannel.cpp
+++ b/src/providers/twitch/TwitchChannel.cpp
@@ -602,6 +602,11 @@ Outcome TwitchChannel::parseLiveStatus(const rapidjson::Document &document)
 
 void TwitchChannel::loadRecentMessages()
 {
+    if (!getSettings()->loadTwitchMessageHistoryOnConnect)
+    {
+        return;
+    }
+
     static QString genericURL = [] {
         QString url("https://recent-messages.robotty.de/api/v2/recent-messages/"
                     "%1?clearchatToNotice=true");
diff --git a/src/singletons/Settings.hpp b/src/singletons/Settings.hpp
index 79cecb032..0d103cc36 100644
--- a/src/singletons/Settings.hpp
+++ b/src/singletons/Settings.hpp
@@ -39,7 +39,8 @@ public:
                                     false};
     BoolSetting compactEmotes = {"/appearance/messages/compactEmotes", true};
     BoolSetting hideModerated = {"/appearance/messages/hideModerated", false};
-    BoolSetting hideModerationActions = {"/appearance/messages/hideModerationActions", false};
+    BoolSetting hideModerationActions = {
+        "/appearance/messages/hideModerationActions", false};
 
     //    BoolSetting collapseLongMessages =
     //    {"/appearance/messages/collapseLongMessages", false};
@@ -189,6 +190,8 @@ public:
     /// Misc
     IntSetting startUpNotification = {"/misc/startUpNotification", 0};
     QStringSetting currentVersion = {"/misc/currentVersion", ""};
+    BoolSetting loadTwitchMessageHistoryOnConnect = {
+        "/misc/twitch/loadMessageHistoryOnConnect", true};
 
     QStringSetting cachePath = {"/cache/path", ""};
 
diff --git a/src/widgets/settingspages/GeneralPage.cpp b/src/widgets/settingspages/GeneralPage.cpp
index efea58d04..2df805554 100644
--- a/src/widgets/settingspages/GeneralPage.cpp
+++ b/src/widgets/settingspages/GeneralPage.cpp
@@ -274,8 +274,10 @@ void GeneralPage::initLayout(SettingsLayout &layout)
     layout.addSpacing(16);
     layout.addSeperator();
 
-    layout.addTitle2("Misc");
+    layout.addTitle2("Miscellaneous (Twitch)");
     layout.addCheckbox("Show twitch whispers inline", s.inlineWhispers);
+    layout.addCheckbox("Load message history on connect",
+                       s.loadTwitchMessageHistoryOnConnect);
 
     /*
     layout.addTitle2("Cache");