diff --git a/CHANGELOG.md b/CHANGELOG.md
index 08c55bef9..10c289e49 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 - Bugfix: Make it possible to filter Watch Streak messages again. Previously, these messages were labeled `sub_messages`. This was fixed in #6571, but we didn't add a new filter to compensate. (#6741)
 - Bugfix: Improve nightly downgrade message. (#6842)
 - Bugfix: Improved blocked user loading on poor internet connections. (#6846)
+- Bugfix: Fixed an issue that could prevent your Twitch subscription emotes from loading. (#6860)
 
 ## 2.5.5-beta.1
 
diff --git a/src/providers/twitch/api/Helix.cpp b/src/providers/twitch/api/Helix.cpp
index b15531e25..7809e39ab 100644
--- a/src/providers/twitch/api/Helix.cpp
+++ b/src/providers/twitch/api/Helix.cpp
@@ -3224,11 +3224,6 @@ void Helix::getUserEmotes(
         [pageCallback](const QJsonObject &json, const auto &state) mutable {
             const auto data = json["data"_L1].toArray();
 
-            if (data.isEmpty())
-            {
-                return false;
-            }
-
             std::vector<HelixChannelEmote> emotes;
             emotes.reserve(data.count());
 
@@ -3914,6 +3909,8 @@ void Helix::paginate(
         if (!onPage(json, state))
         {
             // The consumer doesn't want any more pages
+            qCDebug(chatterinoTwitch)
+                << "paginate onPage returned false for" << url;
             return;
         }