diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index 79eb8114d3..78f770be23 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -94,6 +94,7 @@
 		<li>[Fix] Correctly reset login keys if passed value is the current user. (Bug #54125)</li>
 		<li>[Fix] Correctly set last modified headers. (Bug #54245, thanks Paul.J.Murphy)</li>
 		<li>[Fix] Show correct HTML title when reporting private messages. (Bug #54375)</li>
+		<li>[Fix] Correctly exclude subforums from ATOM Feeds. (Bug #54285)</li>
 		<li>[Change] Send time of last item instead of current time in ATOM Feeds. (Bug #53305)</li>
 		<li>[Change] Use em dash instead of hyphen/minus as separator in ATOM Feeds item statistics. (Bug #53565)</li>
 	</ul>
diff --git a/phpBB/feed.php b/phpBB/feed.php
index 5668d297ad..a3f194ea33 100644
--- a/phpBB/feed.php
+++ b/phpBB/feed.php
@@ -644,7 +644,7 @@ class phpbb_feed
 			}
 
 			// Determine which forums to fetch
-			$not_in_fid = (sizeof($this->excluded_forums())) ? ' AND ' . $db->sql_in_set('f1.forum_id', $this->excluded_forums(), true) : '';
+			$not_in_fid = (sizeof($this->excluded_forums())) ? ' AND ' . $db->sql_in_set('f2.forum_id', $this->excluded_forums(), true) : '';
 
 			// Determine forum childs...
 			$sql = 'SELECT f2.forum_id