diff --git a/lib/server/masterd.py b/lib/server/masterd.py
index 3985b635cce3afba02a083540e26f47effe0fddc..ed294adeedfc771673d51a74bd094770fa9a8538 100644
--- a/lib/server/masterd.py
+++ b/lib/server/masterd.py
@@ -468,12 +468,12 @@ class GanetiContext(object):
 
     self.cfg.SetContext(self)
 
-    # Job queue
-    self.jobqueue = jqueue.JobQueue(self)
-
     # RPC runner
     self.rpc = rpc.RpcRunner(self)
 
+    # Job queue
+    self.jobqueue = jqueue.JobQueue(self)
+
     # setting this also locks the class against attribute modifications
     self.__class__._instance = self