diff --git a/puppet/zulip/files/systemd/system.conf.d/limits.conf b/puppet/zulip/files/systemd/system.conf.d/limits.conf
new file mode 100644
index 0000000000..d6a1957c69
--- /dev/null
+++ b/puppet/zulip/files/systemd/system.conf.d/limits.conf
@@ -0,0 +1,2 @@
+[Manager]
+DefaultLimitNOFILE=1000000
diff --git a/puppet/zulip/manifests/profile/base.pp b/puppet/zulip/manifests/profile/base.pp
index d09b34c66d..178b40fb5e 100644
--- a/puppet/zulip/manifests/profile/base.pp
+++ b/puppet/zulip/manifests/profile/base.pp
@@ -102,6 +102,19 @@ class zulip::profile::base {
     group  => 'root',
     source => 'puppet:///modules/zulip/security/limits.conf',
   }
+  file { '/etc/systemd/system.conf.d/':
+    ensure => directory,
+    mode   => '0755',
+    owner  => 'root',
+    group  => 'root',
+  }
+  file { '/etc/systemd/system.conf.d/limits.conf':
+    ensure => file,
+    mode   => '0644',
+    owner  => 'root',
+    group  => 'root',
+    source => 'puppet:///modules/zulip/systemd/system.conf.d/limits.conf',
+  }
 
   service { 'puppet':
     ensure  => 'stopped',