diff --git a/phpBB/feed.php b/phpBB/feed.php
index 5f19d0161b..a84cc81940 100644
--- a/phpBB/feed.php
+++ b/phpBB/feed.php
@@ -218,10 +218,9 @@ function feed_append_sid($url, $params)
 	$link = (strpos($link, 'sid=') !== false) ? trim(preg_replace('/(&|&|\?)sid=[a-z0-9]+(&|&)?/', '\1', $link), '?& ') : $link;
 
 	// Now the only thing remaining could be an empty &
-	if (substr($link, -5) === '&')
-	{
-		$link = substr($link, 0, -5);
-	}
+	$link = (substr($link, -5) === '&') ? substr($link, 0, -5) : $link;
+	// And &#xxx
+	$link = str_replace('&#', '#', $link);
 
 	return $link;
 }