diff --git a/phpBB/phpbb/feed/controller/feed.php b/phpBB/phpbb/feed/controller/feed.php
index 7e88f18a98..b65e1d9c9b 100644
--- a/phpBB/phpbb/feed/controller/feed.php
+++ b/phpBB/phpbb/feed/controller/feed.php
@@ -123,6 +123,12 @@ class feed
 		$this->template = $twig;
 		$this->language = $language;
 		$this->phpbb_dispatcher = $phpbb_dispatcher;
+
+		// Feeds are disabled, no need to continue
+		if (!$this->config['feed_enable'])
+		{
+			$this->send_unavailable();
+		}
 	}
 
 	/**