diff --git a/boot.php b/boot.php
index d8b9cbf24..99af7d377 100644
--- a/boot.php
+++ b/boot.php
@@ -1420,6 +1420,10 @@ class App {
 
 		$cmdline = implode($args, " ");
 
+		if ($this->min_memory_reached()) {
+			return;
+		}
+
 		if (get_config('system', 'proc_windows')) {
 			$resource = proc_open('cmd /c start /b ' . $cmdline, array(), $foo, dirname(__FILE__));
 		} else {
diff --git a/include/poller.php b/include/poller.php
index 964181988..8f9f5aa24 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -71,6 +71,11 @@ function poller_run($argv, $argc){
 
 	while ($r = poller_worker_process()) {
 
+		// Check free memory
+		if ($a->min_memory_reached()) {
+			return;
+		}
+
 		// Count active workers and compare them with a maximum value that depends on the load
 		if (poller_too_much_workers()) {
 			return;