diff --git a/classes/rpc.php b/classes/rpc.php
index b4de44a74..a84883bfa 100644
--- a/classes/rpc.php
+++ b/classes/rpc.php
@@ -379,6 +379,8 @@ class RPC extends Handler_Protected {
 	}
 
 	function updateFeedBrowser() {
+		if (defined('_DISABLE_FEED_BROWSER') && _DISABLE_FEED_BROWSER) return;
+
 		$search = $this->dbh->escape_string($_REQUEST["search"]);
 		$limit = $this->dbh->escape_string($_REQUEST["limit"]);
 		$mode = (int) $this->dbh->escape_string($_REQUEST["mode"]);
diff --git a/include/feedbrowser.php b/include/feedbrowser.php
index 8907aa9e4..800bcd970 100644
--- a/include/feedbrowser.php
+++ b/include/feedbrowser.php
@@ -1,6 +1,8 @@
 <?php
 	function make_feed_browser($search, $limit, $mode = 1) {
 
+		if (defined('_DISABLE_FEED_BROWSER') && _DISABLE_FEED_BROWSER) return;
+
 		$owner_uid = $_SESSION["uid"];
 		$rv = '';