diff --git a/daemons/ganeti-noded b/daemons/ganeti-noded
index 9a360e6a42de057adc0a1a0eb2eeae87a90e5d00..59b3c3400cd7452e7e26381ae5c677c9c60228df 100755
--- a/daemons/ganeti-noded
+++ b/daemons/ganeti-noded
@@ -54,9 +54,8 @@ def _RequireJobQueueLock(fn):
   """
   def wrapper(*args, **kwargs):
     # Locking in exclusive, blocking mode because there could be several
-    # children running at the same time.
-    # TODO: Implement nonblocking locking with retries?
-    queue_lock.Exclusive(blocking=True)
+    # children running at the same time. Waiting up to 10 seconds.
+    queue_lock.Exclusive(blocking=True, timeout=10)
     try:
       return fn(*args, **kwargs)
     finally: