diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index ebac16abb36d..36a797b82a85 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -161,7 +161,10 @@
         {{ if and (eq .Section "docs") .Site.Data.args.archive}}
         <div class="archive-warning-banner" role="alert">
             {{ (printf (i18n "archive_banner_text") .Site.Data.args.version) | safeHTML }}
-            <a href="/latest{{ .RelPermalink | safeURL }}">{{ i18n "archive_banner_link" }}</a>
+            {{ $rel := .RelPermalink }}
+            {{ $path := replaceRE `^/v[0-9]+\.[0-9]+/` "" $rel | strings.TrimPrefix "/" }}
+            {{ $latestURL := printf "https://istio.io/latest/%s" $path }}
+            <a href="{{ $latestURL | safeURL }}">{{ i18n "archive_banner_link" }}</a>
         </div>
         {{ end }}