diff --git a/assets/js/player.js b/assets/js/player.js
index d07d6cf4..bffc7ad3 100644
--- a/assets/js/player.js
+++ b/assets/js/player.js
@@ -113,20 +113,34 @@ function addCurrentTimeToURL(url) {
 }
 
 /**
- * Timer that updates the timestamp on "watch on youtube" and "embed" links
+ * Timer that updates the timestamp on all external links
  */
 player.ready(function () {
+    // YouTube links
+
     let elem_yt_watch = document.getElementById('link-yt-watch');
     let elem_yt_embed = document.getElementById('link-yt-embed');
-    let elem_iv_embed = document.getElementById('link-iv-embed');
 
     let base_url_yt_watch = elem_yt_watch.getAttribute('data-base-url');
     let base_url_yt_embed = elem_yt_embed.getAttribute('data-base-url');
-    let base_url_iv_embed = elem_iv_embed.getAttribute('data-base-url');
 
-    setTimeout(() => { elem_yt_watch.setAttribute('href') = addCurrentTimeToURL(base_url_yt_watch); }, 5000);
-    setTimeout(() => { elem_yt_embed.setAttribute('href') = addCurrentTimeToURL(base_url_yt_embed); }, 5000);
-    setTimeout(() => { elem_iv_embed.setAttribute('href') = addCurrentTimeToURL(base_url_iv_embed); }, 5000);
+    setTimeout(() => {
+        elem_yt_watch.setAttribute('href') = addCurrentTimeToURL(base_url_yt_watch);
+        elem_yt_embed.setAttribute('href') = addCurrentTimeToURL(base_url_yt_embed);
+    }, 5000);
+
+    // Invidious links
+
+    let elem_iv_embed = document.getElementById('link-iv-embed');
+    let elem_iv_other = document.getElementById('link-iv-other');
+
+    let base_url_iv_embed = elem_iv_embed.getAttribute('data-base-url');
+    let base_url_iv_other = elem_iv_other.getAttribute('data-base-url');
+
+    setTimeout(() => {
+        elem_iv_embed.setAttribute('href') = addCurrentTimeToURL(base_url_iv_embed);
+        elem_iv_other.setAttribute('href') = addCurrentTimeToURL(base_url_iv_other);
+    }, 5000);
 });
 
 
diff --git a/src/invidious/views/watch.ecr b/src/invidious/views/watch.ecr
index a768328a..bf297a43 100644
--- a/src/invidious/views/watch.ecr
+++ b/src/invidious/views/watch.ecr
@@ -127,11 +127,8 @@ we're going to need to do it here in order to allow for translations.
             </span>
 
             <p id="watch-on-another-invidious-instance">
-            <% if env.get("preferences").as(Preferences).automatic_instance_redirect%>
-                <a href="/redirect?referer=<%= env.get?("current_page") %>"><%= translate(locale, "Switch Invidious Instance") %></a>
-            <% else %>
-                <a href="https://redirect.invidious.io<%= env.request.resource %>"><%= translate(locale, "Switch Invidious Instance") %></a>
-            <% end %>
+                <%- link_iv_other = IV::Frontend::Misc.redirect_url(env) -%>
+                <a id="link-iv-other" data-base-url="<%= link_iv_other %>" href="<%= link_iv_other %>"><%= translate(locale, "Switch Invidious Instance") %></a>
             </p>
 
             <p id="embed-link">