diff --git a/CHANGELOG.md b/CHANGELOG.md
index a6710e0dbd2..bd67a95b5df 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
- Bugfix: Fixed scrollbar highlights being visible in overlay windows. (#5769)
- Bugfix: Make macos fonts look the same as v2.5.1. (#5775)
+- Bugfix: Fixed 7TV usernames messing with Qt's HTML (#5780)
- Dev: Hard-code Boost 1.86.0 in macos CI builders. (#5774)
## 2.5.2-beta.1
diff --git a/src/providers/seventv/SeventvEmotes.cpp b/src/providers/seventv/SeventvEmotes.cpp
index b19a6130494..6cc53b3cea8 100644
--- a/src/providers/seventv/SeventvEmotes.cpp
+++ b/src/providers/seventv/SeventvEmotes.cpp
@@ -81,7 +81,8 @@ Tooltip createTooltip(const QString &name, const QString &author, bool isGlobal)
return Tooltip{QString("%1
%2 7TV Emote
By: %3")
.arg(name.toHtmlEscaped(),
isGlobal ? "Global" : "Channel",
- author.isEmpty() ? "" : author)};
+ author.isEmpty() ? "<deleted>"
+ : author.toHtmlEscaped())};
}
Tooltip createAliasedTooltip(const QString &name, const QString &baseName,
@@ -90,7 +91,8 @@ Tooltip createAliasedTooltip(const QString &name, const QString &baseName,
return Tooltip{QString("%1
Alias of %2
%3 7TV Emote
By: %4")
.arg(name.toHtmlEscaped(), baseName.toHtmlEscaped(),
isGlobal ? "Global" : "Channel",
- author.isEmpty() ? "" : author)};
+ author.isEmpty() ? "<deleted>"
+ : author.toHtmlEscaped())};
}
CreateEmoteResult createEmote(const QJsonObject &activeEmote,