diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index 98d0a721794f8c9881136f651705fb50c72a60bb..753120cd1d5ed837398cdef505b4ebf9f29d55f1 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -16530,7 +16530,7 @@ class LUNetworkQuery(NoHooksLU):
 
   def CheckArguments(self):
     self.nq = _NetworkQuery(qlang.MakeSimpleFilter("name", self.op.names),
-                            self.op.output_fields, False)
+                            self.op.output_fields, self.op.use_locking)
 
   def ExpandNames(self):
     self.nq.ExpandNames(self)
diff --git a/lib/opcodes.py b/lib/opcodes.py
index 887b7bb0144c42ed9baf75d9bcdbd88e3554bc52..2c88363b1a997eb1e1ee857d23c320f4ef53a43f 100644
--- a/lib/opcodes.py
+++ b/lib/opcodes.py
@@ -2152,6 +2152,7 @@ class OpNetworkQuery(OpCode):
   """Compute the list of networks."""
   OP_PARAMS = [
     _POutputFields,
+    _PUseLocking,
     ("names", ht.EmptyList, ht.TListOf(ht.TNonEmptyString),
      "Empty list to query all groups, group names otherwise"),
     ]
diff --git a/src/Ganeti/OpCodes.hs b/src/Ganeti/OpCodes.hs
index 8285e9300924b8e21b594344f0f4008efade623d..ec9a34f861dcfce17994105b0da65138c41fb2c4 100644
--- a/src/Ganeti/OpCodes.hs
+++ b/src/Ganeti/OpCodes.hs
@@ -537,7 +537,7 @@ $(genOpCode "OpCode"
      , pNetworkName
      , pIpConflictsCheck
      ])
-  , ("OpNetworkQuery", dOldQueryNoLocking)
+  , ("OpNetworkQuery", dOldQuery)
   , ("OpRestrictedCommand",
      [ pUseLocking
      , pRequiredNodes
diff --git a/test/hs/Test/Ganeti/OpCodes.hs b/test/hs/Test/Ganeti/OpCodes.hs
index aa075683914b4b264c9b2c68e7e048dca473fa60..cf345d19b0a7d2f33be82ebce3261963921d3eeb 100644
--- a/test/hs/Test/Ganeti/OpCodes.hs
+++ b/test/hs/Test/Ganeti/OpCodes.hs
@@ -335,7 +335,7 @@ instance Arbitrary OpCodes.OpCode where
       "OP_NETWORK_DISCONNECT" ->
         OpCodes.OpNetworkDisconnect <$> genNameNE <*> genNameNE <*> arbitrary
       "OP_NETWORK_QUERY" ->
-        OpCodes.OpNetworkQuery <$> genFieldsNE <*> genNamesNE
+        OpCodes.OpNetworkQuery <$> genFieldsNE <*> genNamesNE <*> arbitrary
       "OP_RESTRICTED_COMMAND" ->
         OpCodes.OpRestrictedCommand <$> arbitrary <*> genNodeNamesNE <*>
           genNameNE