diff --git a/src/invidious.cr b/src/invidious.cr
index d15094379..ff1f25791 100644
--- a/src/invidious.cr
+++ b/src/invidious.cr
@@ -3024,6 +3024,55 @@ get "/videoplayback" do |env|
   end
 end
 
+get "/ggpht*" do |env|
+end
+
+get "/ggpht/*" do |env|
+  host = "https://yt3.ggpht.com"
+  client = make_client(URI.parse(host))
+  url = env.request.path.lchop("/ggpht")
+
+  headers = env.request.headers
+  headers.delete("Host")
+  headers.delete("Cookie")
+  headers.delete("User-Agent")
+  headers.delete("Referer")
+
+  client.get(url, headers) do |response|
+    env.response.status_code = response.status_code
+    response.headers.each do |key, value|
+      env.response.headers[key] = value
+    end
+
+    if response.status_code == 304
+      break
+    end
+
+    chunk_size = 4096
+    size = 1
+    if response.headers.includes_word?("Content-Encoding", "gzip")
+      Gzip::Writer.open(env.response) do |deflate|
+        until size == 0
+          size = IO.copy(response.body_io, deflate)
+          env.response.flush
+        end
+      end
+    elsif response.headers.includes_word?("Content-Encoding", "deflate")
+      Flate::Writer.open(env.response) do |deflate|
+        until size == 0
+          size = IO.copy(response.body_io, deflate)
+          env.response.flush
+        end
+      end
+    else
+      until size == 0
+        size = IO.copy(response.body_io, env.response, chunk_size)
+        env.response.flush
+      end
+    end
+  end
+end
+
 get "/vi/:id/:name" do |env|
   id = env.params.url["id"]
   name = env.params.url["name"]
diff --git a/src/invidious/comments.cr b/src/invidious/comments.cr
index 707464996..20716dcc7 100644
--- a/src/invidious/comments.cr
+++ b/src/invidious/comments.cr
@@ -100,10 +100,12 @@ def template_youtube_comments(comments)
       END_HTML
     end
 
+    author_thumbnail = "/ggpht#{URI.parse(child["authorThumbnails"][-1]["url"].as_s).full_path}"
+
     html += <<-END_HTML
     <div class="pure-g">
       <div class="pure-u-2-24">
-        <img style="width:90%; padding-right:1em; padding-top:1em;" src="#{child["authorThumbnails"][-1]["url"]}">
+        <img style="width:90%; padding-right:1em; padding-top:1em;" src="#{author_thumbnail}">
       </div>
       <div class="pure-u-22-24">
         <p>
diff --git a/src/invidious/helpers/helpers.cr b/src/invidious/helpers/helpers.cr
index 68c5cc5bf..aeb275d3c 100644
--- a/src/invidious/helpers/helpers.cr
+++ b/src/invidious/helpers/helpers.cr
@@ -18,7 +18,7 @@ class Config
 end
 
 class FilteredCompressHandler < Kemal::Handler
-  exclude ["/videoplayback", "/videoplayback/*", "/vi/*", "/api/*"]
+  exclude ["/videoplayback", "/videoplayback/*", "/vi/*", "/api/*", "/ggpht/*"]
 
   def call(env)
     return call_next env if exclude_match? env