diff --git a/category-feed-json.njk b/category-feed-json.njk
index d7612f0..7036984 100644
--- a/category-feed-json.njk
+++ b/category-feed-json.njk
@@ -36,8 +36,9 @@ permalink: "categories/{{ categoryFeed.slug }}/feed.json"
     "support": {{ site.support | textcastingSupport | jsonEncode | safe }}
     {%- endif %}
   },
+  {%- set listedCategoryPosts = categoryFeed.posts | excludeUnlistedPosts %}
   "items": [
-    {%- for post in categoryFeed.posts %}
+    {%- for post in listedCategoryPosts %}
     {%- set absolutePostUrl = site.url + post.url %}
     {%- set postImage = post.data.photo %}
     {%- if postImage %}
diff --git a/category-feed.njk b/category-feed.njk
index 0ada9b6..1eedf36 100644
--- a/category-feed.njk
+++ b/category-feed.njk
@@ -18,8 +18,11 @@ permalink: "categories/{{ categoryFeed.slug }}/feed.xml"
     <language>{{ site.locale | default('en') }}</language>
     <atom:link href="{{ site.url }}/categories/{{ categoryFeed.slug }}/feed.xml" rel="self" type="application/rss+xml"/>
     <atom:link href="https://websubhub.com/hub" rel="hub"/>
-    <lastBuildDate>{{ categoryFeed.posts | getNewestCollectionItemDate | dateToRfc822 }}</lastBuildDate>
-    {%- for post in categoryFeed.posts %}
+    {%- set listedCategoryPosts = categoryFeed.posts | excludeUnlistedPosts %}
+    {%- if listedCategoryPosts.length %}
+    <lastBuildDate>{{ listedCategoryPosts | getNewestCollectionItemDate | dateToRfc822 }}</lastBuildDate>
+    {%- endif %}
+    {%- for post in listedCategoryPosts %}
     {%- set absolutePostUrl = site.url + post.url %}
     {%- set postImage = post.data.photo %}
     {%- if postImage %}
diff --git a/feed-json.njk b/feed-json.njk
index aa9a6e3..77d2291 100644
--- a/feed-json.njk
+++ b/feed-json.njk
@@ -32,8 +32,9 @@ eleventyImport:
     "support": {{ site.support | textcastingSupport | jsonEncode | safe }}
     {%- endif %}
   },
+  {%- set listedFeedPosts = collections.feed | excludeUnlistedPosts %}
   "items": [
-    {%- for post in collections.feed %}
+    {%- for post in listedFeedPosts %}
     {%- set absolutePostUrl = site.url + post.url %}
     {%- set postImage = post.data.photo %}
     {%- if postImage %}
diff --git a/feed.njk b/feed.njk
index 0fdfab4..ef53fd0 100644
--- a/feed.njk
+++ b/feed.njk
@@ -14,8 +14,11 @@ eleventyImport:
     <language>{{ site.locale | default('en') }}</language>
     <atom:link href="{{ site.url }}/feed.xml" rel="self" type="application/rss+xml"/>
     <atom:link href="https://websubhub.com/hub" rel="hub"/>
-    <lastBuildDate>{{ collections.feed | getNewestCollectionItemDate | dateToRfc822 }}</lastBuildDate>
-    {%- for post in collections.feed %}
+    {%- set listedFeedPosts = collections.feed | excludeUnlistedPosts %}
+    {%- if listedFeedPosts.length %}
+    <lastBuildDate>{{ listedFeedPosts | getNewestCollectionItemDate | dateToRfc822 }}</lastBuildDate>
+    {%- endif %}
+    {%- for post in listedFeedPosts %}
     {%- set absolutePostUrl = site.url + post.url %}
     {%- set postImage = post.data.photo %}
     {%- if postImage %}
diff --git a/theme/category-feed-json.njk b/theme/category-feed-json.njk
index d7612f0..7036984 100644
--- a/theme/category-feed-json.njk
+++ b/theme/category-feed-json.njk
@@ -36,8 +36,9 @@ permalink: "categories/{{ categoryFeed.slug }}/feed.json"
     "support": {{ site.support | textcastingSupport | jsonEncode | safe }}
     {%- endif %}
   },
+  {%- set listedCategoryPosts = categoryFeed.posts | excludeUnlistedPosts %}
   "items": [
-    {%- for post in categoryFeed.posts %}
+    {%- for post in listedCategoryPosts %}
     {%- set absolutePostUrl = site.url + post.url %}
     {%- set postImage = post.data.photo %}
     {%- if postImage %}
diff --git a/theme/category-feed.njk b/theme/category-feed.njk
index 0ada9b6..1eedf36 100644
--- a/theme/category-feed.njk
+++ b/theme/category-feed.njk
@@ -18,8 +18,11 @@ permalink: "categories/{{ categoryFeed.slug }}/feed.xml"
     <language>{{ site.locale | default('en') }}</language>
     <atom:link href="{{ site.url }}/categories/{{ categoryFeed.slug }}/feed.xml" rel="self" type="application/rss+xml"/>
     <atom:link href="https://websubhub.com/hub" rel="hub"/>
-    <lastBuildDate>{{ categoryFeed.posts | getNewestCollectionItemDate | dateToRfc822 }}</lastBuildDate>
-    {%- for post in categoryFeed.posts %}
+    {%- set listedCategoryPosts = categoryFeed.posts | excludeUnlistedPosts %}
+    {%- if listedCategoryPosts.length %}
+    <lastBuildDate>{{ listedCategoryPosts | getNewestCollectionItemDate | dateToRfc822 }}</lastBuildDate>
+    {%- endif %}
+    {%- for post in listedCategoryPosts %}
     {%- set absolutePostUrl = site.url + post.url %}
     {%- set postImage = post.data.photo %}
     {%- if postImage %}
diff --git a/theme/feed-json.njk b/theme/feed-json.njk
index aa9a6e3..77d2291 100644
--- a/theme/feed-json.njk
+++ b/theme/feed-json.njk
@@ -32,8 +32,9 @@ eleventyImport:
     "support": {{ site.support | textcastingSupport | jsonEncode | safe }}
     {%- endif %}
   },
+  {%- set listedFeedPosts = collections.feed | excludeUnlistedPosts %}
   "items": [
-    {%- for post in collections.feed %}
+    {%- for post in listedFeedPosts %}
     {%- set absolutePostUrl = site.url + post.url %}
     {%- set postImage = post.data.photo %}
     {%- if postImage %}
diff --git a/theme/feed.njk b/theme/feed.njk
index 0fdfab4..ef53fd0 100644
--- a/theme/feed.njk
+++ b/theme/feed.njk
@@ -14,8 +14,11 @@ eleventyImport:
     <language>{{ site.locale | default('en') }}</language>
     <atom:link href="{{ site.url }}/feed.xml" rel="self" type="application/rss+xml"/>
     <atom:link href="https://websubhub.com/hub" rel="hub"/>
-    <lastBuildDate>{{ collections.feed | getNewestCollectionItemDate | dateToRfc822 }}</lastBuildDate>
-    {%- for post in collections.feed %}
+    {%- set listedFeedPosts = collections.feed | excludeUnlistedPosts %}
+    {%- if listedFeedPosts.length %}
+    <lastBuildDate>{{ listedFeedPosts | getNewestCollectionItemDate | dateToRfc822 }}</lastBuildDate>
+    {%- endif %}
+    {%- for post in listedFeedPosts %}
     {%- set absolutePostUrl = site.url + post.url %}
     {%- set postImage = post.data.photo %}
     {%- if postImage %}