diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index 97c1d0df93..e6166dd5f1 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -115,6 +115,7 @@
 		<li>[Fix] Sync reports when using the move all users posts tool in the ACP. (Bug #31165)</li>
 		<li>[Fix] Extra slash is included in the redirect url when redirecting to the forum root directory. (Bug #33605)</li>
 		<li>[Fix] Remove reported flag from shadow topics when closing reports. (Bug #19765)</li>
+		<li>[Fix] Do not show non indexed forums on the search page if they contain no subforums. (Bug #33125)</li>
 
 	</ul>
 
diff --git a/phpBB/search.php b/phpBB/search.php
index 5335680c46..6af534b0b0 100644
--- a/phpBB/search.php
+++ b/phpBB/search.php
@@ -923,7 +923,7 @@ if ($keywords || $author || $author_id || $search_id || $submit)
 
 // Search forum
 $s_forums = '';
-$sql = 'SELECT f.forum_id, f.forum_name, f.parent_id, f.forum_type, f.left_id, f.right_id, f.forum_password, fa.user_id
+$sql = 'SELECT f.forum_id, f.forum_name, f.parent_id, f.forum_type, f.left_id, f.right_id, f.forum_password, f.enable_indexing, fa.user_id
 	FROM ' . FORUMS_TABLE . ' f
 	LEFT JOIN ' . FORUMS_ACCESS_TABLE . " fa ON (fa.forum_id = f.forum_id
 		AND fa.session_id = '" . $db->sql_escape($user->session_id) . "')
@@ -942,6 +942,12 @@ while ($row = $db->sql_fetchrow($result))
 		continue;
 	}
 
+	if ($row['forum_type'] == FORUM_POST && ($row['left_id'] + 1 == $row['right_id']) && !$row['enable_indexing'])
+	{
+		// Postable forum with no subforums and indexing disabled, don't display
+		continue;
+	}
+
 	if ($row['forum_type'] == FORUM_LINK || ($row['forum_password'] && !$row['user_id']))
 	{
 		// if this forum is a link or password protected (user has not entered the password yet) then skip to the next branch