diff --git a/src/invidious/helpers/utils.cr b/src/invidious/helpers/utils.cr
index 7c573aba..ec8aee9e 100644
--- a/src/invidious/helpers/utils.cr
+++ b/src/invidious/helpers/utils.cr
@@ -435,7 +435,7 @@ def fetch_random_instance
         end
 
         if !broken_health_monitoring
-          health = data[1]["monitor"].as_h["dailyRatios"][0].as_h["ratio"]  
+          health = data[1]["monitor"].as_h["dailyRatios"][0].as_h["ratio"]
           filtered_instance_list << data[0].as_s if health.to_s.to_f > 90
         else
           # We can't check the health if the monitoring is broken. Thus we'll just add it to the list
diff --git a/src/invidious/views/components/item.ecr b/src/invidious/views/components/item.ecr
index 532de6ac..6f027bee 100644
--- a/src/invidious/views/components/item.ecr
+++ b/src/invidious/views/components/item.ecr
@@ -148,7 +148,7 @@
                     <a title="<%=translate(locale, "Audio mode")%>" href="/watch?v=<%= item.id %>&amp;listen=1">
                         <i class="icon ion-md-headset"></i>
                     </a>
-                    <a title="<%=translate(locale, "Switch Invidious Instance")%>" href="/redirect?referer=<%= env.get?("current_page") %>">
+                    <a title="<%=translate(locale, "Switch Invidious Instance")%>" href="/redirect?referer=<%=HTML.escape("watch?v=#{item.id}")%>">
                         <i class="icon ion-md-jet"></i>
                     </a>
                 </div>