diff --git a/src/ruby/puppetserver-lib/puppet/server/master.rb b/src/ruby/puppetserver-lib/puppet/server/master.rb
index 1b33dcbf3..488b0d87c 100644
--- a/src/ruby/puppetserver-lib/puppet/server/master.rb
+++ b/src/ruby/puppetserver-lib/puppet/server/master.rb
@@ -278,7 +278,7 @@ def self.getManifests(env)
         when env.manifest == Puppet::Node::Environment::NO_MANIFEST
           []
         when File.directory?(env.manifest)
-          Dir.glob(File.join(env.manifest, '**/*.pp'))
+          Dir.glob(File.join(env.manifest, '**{,/*/}*.pp'))
         when File.exist?(env.manifest)
           [env.manifest]
         else