diff --git a/components/templates/src/builtins/rss.xml b/components/templates/src/builtins/rss.xml
index a67d003..3d5e909 100644
--- a/components/templates/src/builtins/rss.xml
+++ b/components/templates/src/builtins/rss.xml
@@ -2,7 +2,7 @@
 <rss xmlns:atom="http://www.w3.org/2005/Atom" version="2.0">
     <channel>
         <title>{{ config.title }}</title>
-        <link>{{ config.base_url | safe | urlencode | safe }}</link>
+        <link>{{ config.base_url | urlencode | safe }}</link>
         <description>{{ config.description }}</description>
         <generator>Zola</generator>
         <language>{{ config.default_language }}</language>
@@ -12,8 +12,8 @@
             <item>
                 <title>{{ page.title }}</title>
                 <pubDate>{{ page.date | date(format="%a, %d %b %Y %H:%M:%S %z") }}</pubDate>
-                <link>{{ page.permalink | safe | urlencode | safe }}</link>
-                <guid>{{ page.permalink | safe | urlencode | safe }}</guid>
+                <link>{{ page.permalink | urlencode | safe }}</link>
+                <guid>{{ page.permalink | urlencode | safe }}</guid>
                 <description>{% if page.summary %}{{ page.summary }}{% else %}{{ page.content }}{% endif %}</description>
             </item>
         {% endfor %}
diff --git a/components/templates/src/builtins/sitemap.xml b/components/templates/src/builtins/sitemap.xml
index 63e4f23..c789e3f 100644
--- a/components/templates/src/builtins/sitemap.xml
+++ b/components/templates/src/builtins/sitemap.xml
@@ -2,7 +2,7 @@
 <urlset xmlns="https://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd">
     {% for sitemap_entry in entries %}
         <url>
-            <loc>{{ sitemap_entry.permalink | safe | urlencode | safe }}</loc>
+            <loc>{{ sitemap_entry.permalink | urlencode | safe }}</loc>
             {% if sitemap_entry.date %}
                 <lastmod>{{ sitemap_entry.date }}</lastmod>
             {% endif %}