diff --git a/src/invidious.cr b/src/invidious.cr
index 1399c124..1603f4e6 100644
--- a/src/invidious.cr
+++ b/src/invidious.cr
@@ -5168,7 +5168,7 @@ get "/sb/:id/:storyboard/:index" do |env|
       env.response.headers[key] = value
     end
 
-    if response.status_code == 304
+    if response.status_code >= 400
       break
     end
 
diff --git a/src/invidious/helpers/handlers.cr b/src/invidious/helpers/handlers.cr
index 560ed670..98087ec7 100644
--- a/src/invidious/helpers/handlers.cr
+++ b/src/invidious/helpers/handlers.cr
@@ -33,6 +33,11 @@ class Kemal::RouteHandler
       raise Kemal::Exceptions::CustomException.new(context)
     end
 
+    if context.request.method == "HEAD" &&
+       context.request.path.ends_with? ".jpg"
+      context.response.headers["Content-Type"] = "image/jpeg"
+    end
+
     context.response.print(content)
     context
   end