diff --git a/layouts/_default/list.atom.xml b/layouts/_default/list.atom.xml
index 0ab102f4..822e726a 100644
--- a/layouts/_default/list.atom.xml
+++ b/layouts/_default/list.atom.xml
@@ -54,10 +54,8 @@
     {{ end }}
     <id>{{ $id }}</id>
     {{ printf `<link href="%s" rel="self" type="application/atom+xml"/>` ($page.Permalink | safeURL) | safeHTML }}
-    {{ range $page.AlternativeOutputFormats }}
-        {{ if eq .Rel "alternate" }}
-            {{ printf `<link href="%s" rel="alternate" type="%s"/>` (.Permalink | safeURL) .MediaType | safeHTML }}
-        {{ end }}
+    {{ with $page.AlternativeOutputFormats.Get "html" }}
+        {{ printf `<link href="%s" rel="alternate" type="%s"/>` (.Permalink | safeURL) .MediaType | safeHTML }}
     {{ end }}
     {{ range $t := $page.Translations }}
         {{ range .OutputFormats }}
diff --git a/layouts/_default/rss.xml b/layouts/_default/rss.xml
index 3abc28b7..0b53d4e9 100644
--- a/layouts/_default/rss.xml
+++ b/layouts/_default/rss.xml
@@ -14,10 +14,8 @@
 <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
     <channel>
         {{ printf `<atom:link href="%s" rel="self" type="application/rss+xml"/>` ($page.Permalink | safeURL) | safeHTML }}
-        {{ range $page.AlternativeOutputFormats }}
-            {{ if eq .Rel "alternate" }}
-                {{ printf `<atom:link href="%s" rel="alternate" type="%s"/>` (.Permalink | safeURL) .MediaType | safeHTML }}
-            {{ end }}
+        {{ with $page.AlternativeOutputFormats.Get "html" }}
+            {{ printf `<atom:link href="%s" rel="alternate" type="%s"/>` (.Permalink | safeURL) .MediaType | safeHTML }}
         {{ end }}
         {{ with site.Copyright }}
             <copyright>{{ . }}</copyright>