diff --git a/update.php b/update.php
index 5e4a5ab79..0141b1a8e 100755
--- a/update.php
+++ b/update.php
@@ -175,7 +175,9 @@
 		}
 
 		update_daemon_common(isset($options["pidlock"]) ? 50 : DAEMON_FEED_LIMIT);
-		housekeeping_common(true);
+
+		if (!isset($options["pidlock"]) || $options["task"] == 0)
+			housekeeping_common(true);
 
 		PluginHost::getInstance()->run_hooks(PluginHost::HOOK_UPDATE_TASK, "hook_update_task", $op);
 	}