diff --git a/src/invidious/views/channel.ecr b/src/invidious/views/channel.ecr
index 66f1ae10..40b553a9 100644
--- a/src/invidious/views/channel.ecr
+++ b/src/invidious/views/channel.ecr
@@ -48,7 +48,7 @@
             <% 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.get?("current_page") %>"><%= translate(locale, "Switch Invidious Instance") %></a>
+                <a href="https://redirect.invidious.io<%= env.request.path %>"><%= translate(locale, "Switch Invidious Instance") %></a>
             <% end %>
         </div>
         <% if !channel.auto_generated %>
diff --git a/src/invidious/views/community.ecr b/src/invidious/views/community.ecr
index 17bc4f89..f0add06b 100644
--- a/src/invidious/views/community.ecr
+++ b/src/invidious/views/community.ecr
@@ -47,7 +47,7 @@
             <% 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.get?("current_page") %>"><%= translate(locale, "Switch Invidious Instance") %></a>
+                <a href="https://redirect.invidious.io<%= env.request.resource %>"><%= translate(locale, "Switch Invidious Instance") %></a>
             <% end %>
         </div>
         <% if !channel.auto_generated %>
diff --git a/src/invidious/views/playlist.ecr b/src/invidious/views/playlist.ecr
index 4c23ad98..d0518de7 100644
--- a/src/invidious/views/playlist.ecr
+++ b/src/invidious/views/playlist.ecr
@@ -47,7 +47,7 @@
                             <%= translate(locale, "Switch Invidious Instance") %>
                         </a>
                     <% else %>
-                        <a href="https://redirect.invidious.io/<%= env.get?("current_page") %>">
+                        <a href="https://redirect.invidious.io<%= env.request.resource %>">
                             <%= translate(locale, "Switch Invidious Instance") %>
                         </a>
                     <% end %>
diff --git a/src/invidious/views/playlists.ecr b/src/invidious/views/playlists.ecr
index 74890f5a..12dba088 100644
--- a/src/invidious/views/playlists.ecr
+++ b/src/invidious/views/playlists.ecr
@@ -50,7 +50,7 @@
             <% 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.get?("current_page") %>"><%= translate(locale, "Switch Invidious Instance") %></a>
+                <a href="https://redirect.invidious.io<%= env.request.resource %>"><%= translate(locale, "Switch Invidious Instance") %></a>
             <% end %>
         </div>
 
diff --git a/src/invidious/views/watch.ecr b/src/invidious/views/watch.ecr
index 928e5645..2f3709dd 100644
--- a/src/invidious/views/watch.ecr
+++ b/src/invidious/views/watch.ecr
@@ -119,7 +119,7 @@ we're going to need to do it here in order to allow for translations.
             <% 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.get?("current_page") %>"><%= translate(locale, "Switch Invidious Instance") %></a>
+                <a href="https://redirect.invidious.io<%= env.request.resource %>"><%= translate(locale, "Switch Invidious Instance") %></a>
             <% end %>
             </p>
             <p id="embed-link">