diff --git a/htools/Ganeti/Luxi.hs b/htools/Ganeti/Luxi.hs
index 65132e017487396a71ddc6f6fb4eddd94c5f187b..ff3989239d8acbb9483a45951a236243f8f7e24f 100644
--- a/htools/Ganeti/Luxi.hs
+++ b/htools/Ganeti/Luxi.hs
@@ -324,8 +324,10 @@ decodeCall (LuxiCall call args) =
   case call of
     ReqQueryJobs -> do
               (jids, jargs) <- fromJVal args
-              let rargs = map fromJSString jargs
-              return $ QueryJobs jids rargs
+              jids' <- case jids of
+                         JSNull -> return []
+                         _ -> fromJVal jids
+              return $ QueryJobs jids' jargs
     ReqQueryInstances -> do
               (names, fields, locking) <- fromJVal args
               return $ QueryInstances names fields locking