1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/server/runner.rb b/lib/puppet/server/runner.rb
index 985ed2d3b..46fd7a7ae 100755
--- a/lib/puppet/server/runner.rb
+++ b/lib/puppet/server/runner.rb
@@ -18,7 +18,7 @@ class Server
                 raise MissingMasterError, "Could not find the master client"
             end
 
-            if master.locked?
+            if Puppet::Util::Pidlock.new(Puppet[:puppetdlockfile]).locked?
                 Puppet.notice "Could not trigger run; already running"
                 return "running"
             end