diff --git a/src/ruby/puppetserver-lib/puppet/server/master.rb b/src/ruby/puppetserver-lib/puppet/server/master.rb
index 8d69a014b2..832beaa8e7 100644
--- a/src/ruby/puppetserver-lib/puppet/server/master.rb
+++ b/src/ruby/puppetserver-lib/puppet/server/master.rb
@@ -97,12 +97,7 @@ def getClassInfoForEnvironment(env)
 
   def getTransportInfoForEnvironment(env)
     require 'puppet/resource_api/transport'
-
-    environment = @env_loader.get!(env)
-    Puppet.override({current_environment: environment}) do
-      @transports_loader.loadall(environment)
-      Puppet::ResourceApi::Transport.list.values.map(&:definition)
-    end
+    Puppet::ResourceApi::Transport.list_all_transports(env).values.map(&:definition)
   end
 
   def getModuleInfoForEnvironment(env)