diff --git a/site/profiles/manifests/puppet/client.pp b/site/profiles/manifests/puppet/client.pp
index aa3444c..1888cf5 100644
--- a/site/profiles/manifests/puppet/client.pp
+++ b/site/profiles/manifests/puppet/client.pp
@@ -12,6 +12,7 @@ class profiles::puppet::client (
   Integer $runtimeout         = 3600,
   Boolean $show_diff          = true,
   Boolean $usecacheonfailure  = false,
+  Integer $facts_soft_limit   = 4096,
 ) {
 
   # dont manage puppet.conf if this is a puppetmaster
diff --git a/site/profiles/manifests/puppet/server.pp b/site/profiles/manifests/puppet/server.pp
index 771d41a..5d0c50b 100644
--- a/site/profiles/manifests/puppet/server.pp
+++ b/site/profiles/manifests/puppet/server.pp
@@ -28,6 +28,7 @@ class profiles::puppet::server (
   Integer $runinterval            = 1800,
   Integer $runtimeout             = 3600,
   Boolean $show_diff              = true,
+  Integer $facts_soft_limit       = 4096,
 ) {
 
   file { '/etc/puppetlabs/puppet/puppet.conf':
@@ -59,6 +60,7 @@ class profiles::puppet::server (
       'storeconfigs_backend' => $storeconfigs_backend,
       'reports'              => $reports,
       'usecacheonfailure'    => $usecacheonfailure,
+      'facts_soft_limit'     => $facts_soft_limit,
     }),
     notify  => Service['puppetserver'],
   }
diff --git a/site/profiles/templates/puppet/client/puppet.conf.erb b/site/profiles/templates/puppet/client/puppet.conf.erb
index 40874c6..65f3328 100644
--- a/site/profiles/templates/puppet/client/puppet.conf.erb
+++ b/site/profiles/templates/puppet/client/puppet.conf.erb
@@ -11,3 +11,4 @@ runinterval = <%= @runinterval %>
 runtimeout = <%= @runtimeout %>
 show_diff = <%= @show_diff %>
 usecacheonfailure = <%= @usecacheonfailure %>
+number_of_facts_soft_limit = <%= @facts_soft_limit %>
diff --git a/site/profiles/templates/puppet/server/puppet.conf.epp b/site/profiles/templates/puppet/server/puppet.conf.epp
index dbb93ee..1831263 100644
--- a/site/profiles/templates/puppet/server/puppet.conf.epp
+++ b/site/profiles/templates/puppet/server/puppet.conf.epp
@@ -17,6 +17,7 @@ report_server = <%= $report_server %>
 runinterval = <%= $runinterval %>
 runtimeout = <%= $runtimeout %>
 show_diff = <%= $show_diff %>
+number_of_facts_soft_limit = <%= $facts_soft_limit %>
 
 [master]
 node_terminus = <%= $node_terminus %>