diff --git a/themes/cmd/layout/category.swig b/themes/cmd/layout/category.swig
index d5ae5f0..65a7a5f 100644
--- a/themes/cmd/layout/category.swig
+++ b/themes/cmd/layout/category.swig
@@ -9,7 +9,11 @@
       <h2 style="margin-left: 1rem; margin-bottom: 0;">{{page.category}}<i class="mdi mdi-tag" style="font-size: 2rem; color: #ee6e73;"></i></h2>
       {% if site.data.theme.topic_rss and site.data.theme.topic_rss.category %}
         {% set category_rss = site.data.theme.topic_rss.category %}
-        {% set rss_name = category_rss.name_lowercase? page.category.toLowerCase(): page.category %}
+        {% if category_rss.name_lowercase %}
+          {% set rss_name = page.tag.toLowerCase() %}
+        {% else %}
+          {% set rss_name = page.tag %}
+        {% endif %}
         <div class="card-action">
           {% if category_rss.atom_suffix %}
             <a href="{{ full_url_for(category_rss.prefix + rss_name + category_rss.atom_suffix) }}">Feed (Atom)</a>
diff --git a/themes/cmd/layout/tag.swig b/themes/cmd/layout/tag.swig
index 73fea8b..81bc0c4 100644
--- a/themes/cmd/layout/tag.swig
+++ b/themes/cmd/layout/tag.swig
@@ -8,7 +8,11 @@
       <h2 style="margin-left: 1rem; margin-bottom: 0;">{{page.tag}}<i class="mdi mdi-tag" style="font-size: 2rem; color: #ee6e73;"></i></h2>
       {% if site.data.theme.topic_rss and site.data.theme.topic_rss.tag %}
         {% set tag_rss = site.data.theme.topic_rss.tag %}
-        {% set rss_name = tag_rss.name_lowercase? page.tag.toLowerCase(): page.tag %}
+        {% if tag_rss.name_lowercase %}
+          {% set rss_name = page.tag.toLowerCase() %}
+        {% else %}
+          {% set rss_name = page.tag %}
+        {% endif %}
         <div class="card-action">
           {% if tag_rss.atom_suffix %}
             <a href="{{ full_url_for(tag_rss.prefix + rss_name + tag_rss.atom_suffix) }}">Feed (Atom)</a>