diff --git a/contrib/init/systemd/docker.service b/contrib/init/systemd/docker.service
index 6015b7441f..d43658e700 100644
--- a/contrib/init/systemd/docker.service
+++ b/contrib/init/systemd/docker.service
@@ -11,6 +11,7 @@ MountFlags=slave
 LimitNOFILE=1048576
 LimitNPROC=1048576
 LimitCORE=infinity
+TasksMax=1048576
 TimeoutStartSec=0
 
 [Install]
diff --git a/docs/articles/systemd.md b/docs/articles/systemd.md
index 633466dc79..5eec275ca8 100644
--- a/docs/articles/systemd.md
+++ b/docs/articles/systemd.md
@@ -88,6 +88,7 @@ In this example, we'll assume that your `docker.service` file looks something li
     ExecStart=/usr/bin/docker daemon -H fd://
     LimitNOFILE=1048576
     LimitNPROC=1048576
+    TasksMax=1048576
 
     [Install]
     Also=docker.socket