diff --git a/src/invidious/routes/errors.cr b/src/invidious/routes/errors.cr
index 5c8d7d06..6d305578 100644
--- a/src/invidious/routes/errors.cr
+++ b/src/invidious/routes/errors.cr
@@ -15,19 +15,6 @@ module Invidious::Routes::ErrorRoutes
         response = YT_POOL.client &.get(URI.parse(response.headers["Location"]).request_target)
       end
 
-      #if response.body.empty?
-      #  env.response.headers["Location"] = "/"
-      #  haltf env, status_code: 302
-      #end
-
-      #html = XML.parse_html(response.body)
-      #ucid = html.xpath_node(%q(//link[@rel="canonical"])).try &.["href"].split("/")[-1]
-
-      #if ucid
-      #  env.response.headers["Location"] = "/channel/#{ucid}"
-      #  haltf env, status_code: 302
-      #end
-
       params = [] of String
       env.params.query.each do |k, v|
         params << "#{k}=#{v}"
@@ -44,6 +31,19 @@ module Invidious::Routes::ErrorRoutes
         env.response.headers["Location"] = url
         haltf env, status_code: 302
       end
+
+      if response.body.empty?
+        env.response.headers["Location"] = "/"
+        haltf env, status_code: 302
+      end
+
+      html = XML.parse_html(response.body)
+      ucid = html.xpath_node(%q(//link[@rel="canonical"])).try &.["href"].split("/")[-1]
+
+      if ucid
+        env.response.headers["Location"] = "/channel/#{ucid}"
+        haltf env, status_code: 302
+      end
     end
 
     env.response.headers["Location"] = "/"