diff --git a/kernel/util/misc.go b/kernel/util/misc.go
index 389dfc5e7..b76277f3d 100644
--- a/kernel/util/misc.go
+++ b/kernel/util/misc.go
@@ -42,13 +42,12 @@ func RemoveElem[T any](s []T, index int) []T {
 }
 
 func EscapeHTML(s string) string {
-	if strings.Contains(s, "&") || strings.Contains(s, """) || strings.Contains(s, "<") || strings.Contains(s, ">") || strings.Contains(s, "'") || strings.Contains(s, "'") {
-		return s
-	}
-
 	if strings.ContainsAny(s, "<>\"'") {
 		return html.EscapeString(s)
 	}
+	if strings.Contains(s, "&amp;") || strings.Contains(s, "&quot;") || strings.Contains(s, "&lt;") || strings.Contains(s, "&gt;") || strings.Contains(s, "&#39;") || strings.Contains(s, "&apos;") {
+		return s
+	}
 	return s
 }