diff --git a/manifests/server.pp b/manifests/server.pp
index cf3bda0848..33f9045513 100644
--- a/manifests/server.pp
+++ b/manifests/server.pp
@@ -103,6 +103,7 @@
 # @param grants Specifies a hash from which to generate postgresql::server::grant resources.
 # @param config_entries Specifies a hash from which to generate postgresql::server::config_entry resources.
 # @param pg_hba_rules Specifies a hash from which to generate postgresql::server::pg_hba_rule resources.
+# @param grant_roles Specifies a hash from which to generate postgresql::server::grant_role resources. 
 #
 # @param backup_enable Whether a backup job should be enabled.
 # @param backup_options A hash of options that should be passed through to the backup provider.
@@ -189,6 +190,7 @@
   Hash[String[1], Hash]                              $grants                       = {},
   Hash[String, Any]                                  $config_entries               = {},
   Postgresql::Pg_hba_rules                           $pg_hba_rules                 = {},
+  Hash[String[1], Hash]                              $grant_roles                  = {},
 
   Boolean                                            $backup_enable                = $postgresql::params::backup_enable,
   Hash                                               $backup_options               = {},
@@ -225,6 +227,12 @@
     }
   }
 
+  $grant_roles.each |$grantname, $grant_role| {
+    postgresql::server::grant_role { $grantname:
+      * => $grant_role,
+    }
+  }
+
   $config_entries.each |$entry, $value| {
     postgresql::server::config_entry { $entry:
       ensure => bool2str($value =~ Undef, 'absent', 'present'),
diff --git a/manifests/server/grant_role.pp b/manifests/server/grant_role.pp
index 11ef6a70de..48b69d04fd 100644
--- a/manifests/server/grant_role.pp
+++ b/manifests/server/grant_role.pp
@@ -42,9 +42,6 @@
     connect_settings => $connect_settings,
   }
 
-  if empty($connect_settings) {
-    Class['postgresql::server'] -> Postgresql_psql["grant_role:${name}"]
-  }
   if defined(Postgresql::Server::Role[$role]) {
     Postgresql::Server::Role[$role] -> Postgresql_psql["grant_role:${name}"]
   }