diff --git a/manifests/init.pp b/manifests/init.pp
index 893b06de..c0643226 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -38,6 +38,7 @@
   $node_purge_ttl                    = $puppetdb::params::node_purge_ttl,
   $report_ttl                        = $puppetdb::params::report_ttl,
   $gc_interval                       = $puppetdb::params::gc_interval,
+  $node_purge_gc_batch_limit         = $puppetdb::params::node_purge_gc_batch_limit,
   $log_slow_statements               = $puppetdb::params::log_slow_statements,
   $conn_max_age                      = $puppetdb::params::conn_max_age,
   $conn_keep_alive                   = $puppetdb::params::conn_keep_alive,
@@ -112,6 +113,7 @@
     node_purge_ttl                    => $node_purge_ttl,
     report_ttl                        => $report_ttl,
     gc_interval                       => $gc_interval,
+    node_purge_gc_batch_limit         => $node_purge_gc_batch_limit,
     log_slow_statements               => $log_slow_statements,
     conn_max_age                      => $conn_max_age,
     conn_keep_alive                   => $conn_keep_alive,
diff --git a/manifests/params.pp b/manifests/params.pp
index a34e5ebb..d953ee97 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -41,7 +41,8 @@
   $node_purge_ttl         = '14d'
   $report_ttl             = '14d'
 
-  $gc_interval            = '60'
+  $gc_interval               = '60'
+  $node_purge_gc_batch_limit = '25'
 
   $log_slow_statements    = '10'
   $conn_max_age           = '60'
diff --git a/manifests/server.pp b/manifests/server.pp
index 0c1c9acf..8d442363 100644
--- a/manifests/server.pp
+++ b/manifests/server.pp
@@ -32,6 +32,7 @@
   $node_purge_ttl                         = $puppetdb::params::node_purge_ttl,
   $report_ttl                             = $puppetdb::params::report_ttl,
   $gc_interval                            = $puppetdb::params::gc_interval,
+  $node_purge_gc_batch_limit              = $puppetdb::params::node_purge_gc_batch_limit,
   $log_slow_statements                    = $puppetdb::params::log_slow_statements,
   $conn_max_age                           = $puppetdb::params::conn_max_age,
   $conn_keep_alive                        = $puppetdb::params::conn_keep_alive,
@@ -155,28 +156,29 @@
   }
 
   class { 'puppetdb::server::database':
-    database               => $database,
-    database_host          => $database_host,
-    database_port          => $database_port,
-    database_username      => $database_username,
-    database_password      => $database_password,
-    database_name          => $database_name,
-    database_max_pool_size => $database_max_pool_size,
-    jdbc_ssl_properties    => $jdbc_ssl_properties,
-    database_validate      => $database_validate,
-    database_embedded_path => $database_embedded_path,
-    node_ttl               => $node_ttl,
-    node_purge_ttl         => $node_purge_ttl,
-    report_ttl             => $report_ttl,
-    gc_interval            => $gc_interval,
-    log_slow_statements    => $log_slow_statements,
-    conn_max_age           => $conn_max_age,
-    conn_keep_alive        => $conn_keep_alive,
-    conn_lifetime          => $conn_lifetime,
-    confdir                => $confdir,
-    puppetdb_user          => $puppetdb_user,
-    puppetdb_group         => $puppetdb_group,
-    notify                 => Service[$puppetdb_service],
+    database                  => $database,
+    database_host             => $database_host,
+    database_port             => $database_port,
+    database_username         => $database_username,
+    database_password         => $database_password,
+    database_name             => $database_name,
+    database_max_pool_size    => $database_max_pool_size,
+    jdbc_ssl_properties       => $jdbc_ssl_properties,
+    database_validate         => $database_validate,
+    database_embedded_path    => $database_embedded_path,
+    node_ttl                  => $node_ttl,
+    node_purge_ttl            => $node_purge_ttl,
+    report_ttl                => $report_ttl,
+    gc_interval               => $gc_interval,
+    node_purge_gc_batch_limit => $node_purge_gc_batch_limit,
+    log_slow_statements       => $log_slow_statements,
+    conn_max_age              => $conn_max_age,
+    conn_keep_alive           => $conn_keep_alive,
+    conn_lifetime             => $conn_lifetime,
+    confdir                   => $confdir,
+    puppetdb_user             => $puppetdb_user,
+    puppetdb_group            => $puppetdb_group,
+    notify                    => Service[$puppetdb_service],
   }
 
   class { 'puppetdb::server::read_database':
diff --git a/manifests/server/database.pp b/manifests/server/database.pp
index ec927c7e..f4af1ed2 100644
--- a/manifests/server/database.pp
+++ b/manifests/server/database.pp
@@ -1,26 +1,27 @@
 # PRIVATE CLASS - do not use directly
 class puppetdb::server::database (
-  $database               = $puppetdb::params::database,
-  $database_host          = $puppetdb::params::database_host,
-  $database_port          = $puppetdb::params::database_port,
-  $database_username      = $puppetdb::params::database_username,
-  $database_password      = $puppetdb::params::database_password,
-  $database_name          = $puppetdb::params::database_name,
-  $jdbc_ssl_properties    = $puppetdb::params::jdbc_ssl_properties,
-  $database_validate      = $puppetdb::params::database_validate,
-  $database_embedded_path = $puppetdb::params::database_embedded_path,
-  $node_ttl               = $puppetdb::params::node_ttl,
-  $node_purge_ttl         = $puppetdb::params::node_purge_ttl,
-  $report_ttl             = $puppetdb::params::report_ttl,
-  $gc_interval            = $puppetdb::params::gc_interval,
-  $log_slow_statements    = $puppetdb::params::log_slow_statements,
-  $conn_max_age           = $puppetdb::params::conn_max_age,
-  $conn_keep_alive        = $puppetdb::params::conn_keep_alive,
-  $conn_lifetime          = $puppetdb::params::conn_lifetime,
-  $confdir                = $puppetdb::params::confdir,
-  $puppetdb_user          = $puppetdb::params::puppetdb_user,
-  $puppetdb_group         = $puppetdb::params::puppetdb_group,
-  $database_max_pool_size = $puppetdb::params::database_max_pool_size,
+  $database                   = $puppetdb::params::database,
+  $database_host              = $puppetdb::params::database_host,
+  $database_port              = $puppetdb::params::database_port,
+  $database_username          = $puppetdb::params::database_username,
+  $database_password          = $puppetdb::params::database_password,
+  $database_name              = $puppetdb::params::database_name,
+  $jdbc_ssl_properties        = $puppetdb::params::jdbc_ssl_properties,
+  $database_validate          = $puppetdb::params::database_validate,
+  $database_embedded_path     = $puppetdb::params::database_embedded_path,
+  $node_ttl                   = $puppetdb::params::node_ttl,
+  $node_purge_ttl             = $puppetdb::params::node_purge_ttl,
+  $report_ttl                 = $puppetdb::params::report_ttl,
+  $gc_interval                = $puppetdb::params::gc_interval,
+  $node_purge_gc_batch_limit  = $puppetdb::params::node_purge_gc_batch_limit,
+  $log_slow_statements        = $puppetdb::params::log_slow_statements,
+  $conn_max_age               = $puppetdb::params::conn_max_age,
+  $conn_keep_alive            = $puppetdb::params::conn_keep_alive,
+  $conn_lifetime              = $puppetdb::params::conn_lifetime,
+  $confdir                    = $puppetdb::params::confdir,
+  $puppetdb_user              = $puppetdb::params::puppetdb_user,
+  $puppetdb_group             = $puppetdb::params::puppetdb_group,
+  $database_max_pool_size     = $puppetdb::params::database_max_pool_size,
 ) inherits puppetdb::params {
 
   if str2bool($database_validate) {
@@ -122,6 +123,11 @@
     value   => $gc_interval,
   }
 
+  ini_setting { 'puppetdb_node_purge_gc_batch_limit':
+    setting => 'node-purge-gc-batch-limit',
+    value   => $node_purge_gc_batch_limit,
+  }
+
   ini_setting { 'puppetdb_node_ttl':
     setting => 'node-ttl',
     value   => $node_ttl,