diff --git a/config.php-dist b/config.php-dist
index 55c068441..8001513d0 100644
--- a/config.php-dist
+++ b/config.php-dist
@@ -161,7 +161,10 @@
 	// These two options enable SMTP authentication when sending
 	// digests. Require DIGEST_SMTP_HOST.
 
-	define('CONFIG_VERSION', 11);
+	define('DAEMON_FEED_LIMIT', 100);
+	// Limits the amount of feeds daemon updates on one run
+
+	define('CONFIG_VERSION', 12);
 	// Expected config version. Please update this option in config.php
 	// if necessary (after migrating all new options from this file).
 
diff --git a/sanity_check.php b/sanity_check.php
index 4e99dc20a..a8a91b73c 100644
--- a/sanity_check.php
+++ b/sanity_check.php
@@ -1,7 +1,7 @@
 <?php
 	require_once "functions.php";
 
-	define('EXPECTED_CONFIG_VERSION', 11);
+	define('EXPECTED_CONFIG_VERSION', 12);
 	define('SCHEMA_VERSION', 26);
 
 	if (!file_exists("config.php")) {
diff --git a/update_daemon.php b/update_daemon.php
index 50d13191c..75229f667 100644
--- a/update_daemon.php
+++ b/update_daemon.php
@@ -133,7 +133,7 @@
 				ttrss_feeds,ttrss_users 
 			WHERE 
 				ttrss_users.id = owner_uid $login_thresh_qpart 
-			ORDER BY $random_qpart DESC");
+			ORDER BY $random_qpart DESC LIMIT " . DAEMON_FEED_LIMIT);
 
 		$user_prefs_cache = array();