diff --git a/layout/_partials/head.swig b/layout/_partials/head.swig
index 3f6149186..8f2d3b43b 100644
--- a/layout/_partials/head.swig
+++ b/layout/_partials/head.swig
@@ -1,3 +1,7 @@
+{% if theme.rss == '' and config.feed and config.feed.path %}
+    {% set theme.rss = config.root + config.feed.path %}
+{% endif %}
+
 <meta charset="UTF-8"/>
 <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
 <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1"/>
@@ -13,8 +17,7 @@
 {% endif %}
 
 {% if theme.rss %}
-    <link rel="alternate" href="{{ url_for(theme.rss) }}"
-          title="{{ config.title }}" type="application/atom+xml" />
+    <link rel="alternate" href="{{ url_for(theme.rss) }}" title="{{ config.title }}" type="application/atom+xml" />
 {% endif %}
 
 {% if theme.favicon %}
diff --git a/layout/_partials/header.swig b/layout/_partials/header.swig
index 8618dc504..2f585acec 100644
--- a/layout/_partials/header.swig
+++ b/layout/_partials/header.swig
@@ -1,11 +1,3 @@
-{% if theme.rss !== false %}
-  {% if theme.rss %}
-    {% set feed_uri = theme.rss %}
-  {% elif config.feed and config.feed.path %}
-    {% set feed_uri = config.root + config.feed.path %}
-  {% endif %}
-{% endif %}
-
 <h1 class="site-meta">
     <a href="{{ config.root }}" class="brand">
         <span class="logo">
@@ -26,9 +18,9 @@
         </a>
       </li>
     {% endfor %}
-    {% if feed_uri %}
+    {% if theme.rss %}
       <li class="menu-item menu-item-feed">
-        <a href="{{ url_for(feed_uri) }}">
+        <a href="{{ url_for(theme.rss) }}">
           <i class="menu-item-icon icon-feed"></i> <br />
           RSS
         </a>