diff --git a/CHANGELOG.md b/CHANGELOG.md
index 35f3f69b577be02336b7f598205264f2a8178f56..283c8880f0c16cacafc258e6bca603c17d806384 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,8 @@ Note that since we don't clearly distinguish between a public and private interf
 
 ## [Unreleased]
 
+- Fix VolumeServer/query CLI
+
 ## [v3.0.0] - 2022-01-23
 
 - Assembly handling tweaks:
diff --git a/src/servers/volume/config.ts b/src/servers/volume/config.ts
index cc51934c1acc0275d88c3bb37b1e846b8e91e7d1..aac669db942dbca222018a267b588ccc8fe918c1 100644
--- a/src/servers/volume/config.ts
+++ b/src/servers/volume/config.ts
@@ -197,13 +197,13 @@ export function configureLocal() {
         description: VOLUME_SERVER_HEADER
     });
     parser.add_argument('--jobs', { help: `Path to a JSON file with job specification.`, required: false });
-    parser.add_argument('--jobsTemplate', { help: 'Print example template for jobs.json and exit.', required: false, nargs: 0 });
+    parser.add_argument('--jobsTemplate', { help: 'Print example template for jobs.json and exit.', required: false, action: 'store_true' });
     addJsonConfigArgs(parser);
     addLimitsArgs(parser);
 
     const config = parser.parse_args() as LimitsConfig & ServerJsonConfig;
 
-    if (config.cfgTemplate !== null) {
+    if (config.cfgTemplate) {
         console.log(JSON.stringify(DefaultLimitsConfig, null, 2));
         process.exit(0);
     }
@@ -216,7 +216,7 @@ export function configureLocal() {
             setLimitsConfig(cfg);
         }
 
-        if (config.printCfg !== null) {
+        if (config.printCfg) {
             console.log(JSON.stringify(LimitsConfig, null, 2));
             process.exit(0);
         }
diff --git a/src/servers/volume/query.ts b/src/servers/volume/query.ts
index b71dcc2d4fb6d83c61d4e771d4b8b315aaddc7b7..7909ca76b2fb05b9e4d6b4ee4d92927f04715e11 100644
--- a/src/servers/volume/query.ts
+++ b/src/servers/volume/query.ts
@@ -14,7 +14,7 @@ import * as LocalApi from './server/local-api';
 
 const config = configureLocal();
 
-if (config.jobsTemplate !== null) {
+if (config.jobsTemplate) {
     const exampleJobs: LocalApi.JobEntry[] = [{
         source: {
             filename: `g:/test/mdb/xray-1tqn.mdb`,