diff --git a/src/invidious/comments.cr b/src/invidious/comments.cr
index aa3233d4..cd96565b 100644
--- a/src/invidious/comments.cr
+++ b/src/invidious/comments.cr
@@ -441,8 +441,12 @@ def replace_links(html)
     end
   end
 
-  html = html.to_xml(options: XML::SaveOptions::NO_DECL)
-  return html
+  html = html.xpath_node(%q(//body)).not_nil!
+  if node = html.xpath_node(%q(./p))
+    html = node
+  end
+
+  return html.to_xml(options: XML::SaveOptions::NO_DECL)
 end
 
 def fill_links(html, scheme, host)
@@ -459,12 +463,10 @@ def fill_links(html, scheme, host)
   end
 
   if host == "www.youtube.com"
-    html = html.xpath_node(%q(//body)).not_nil!.to_xml
-  else
-    html = html.to_xml(options: XML::SaveOptions::NO_DECL)
+    html = html.xpath_node(%q(//body/p)).not_nil!
   end
 
-  return html
+  return html.to_xml(options: XML::SaveOptions::NO_DECL)
 end
 
 def content_to_comment_html(content)
diff --git a/src/invidious/videos.cr b/src/invidious/videos.cr
index 2f5faf98..beaa1330 100644
--- a/src/invidious/videos.cr
+++ b/src/invidious/videos.cr
@@ -880,7 +880,7 @@ def fetch_video(id, proxies, region)
   info["avg_rating"] = "#{avg_rating}"
 
   description = html.xpath_node(%q(//p[@id="eow-description"]))
-  description = description ? description.to_xml : ""
+  description = description ? description.to_xml(options: XML::SaveOptions::NO_DECL) : ""
 
   wilson_score = ci_lower_bound(likes, likes + dislikes)