diff --git a/src/Ganeti/Query/Server.hs b/src/Ganeti/Query/Server.hs
index f95b9ce9a105186249417103e0359390a8131220..f9dc2131d4e8a393d17610e9728cae43bad45f1d 100644
--- a/src/Ganeti/Query/Server.hs
+++ b/src/Ganeti/Query/Server.hs
@@ -468,7 +468,6 @@ main :: MainFn () PrepResult
 main _ _ (server, cref, jq) = do
   initConfigReader id cref
   let creader = readIORef cref
-  initJQScheduler jq
 
   qlockFile <- jobQueueLockFile
   _ <- lockFile qlockFile >>= exitIfBad "Failed to obtain the job-queue lock"
@@ -478,6 +477,8 @@ main _ _ (server, cref, jq) = do
 
   _ <- forkIO . void $ activateMasterIP
 
+  initJQScheduler jq
+
   finally
     (forever $ U.listener (luxiHandler (qlock, jq, creader)) server)
     (closeServer server)