diff --git a/lib/client/gnt_node.py b/lib/client/gnt_node.py
index 005501a9c58d5d92ab98b48a76b19b820eadf072..cbf98832ec4f6641a0f9e7f5dddb1b524ff7ef02 100644
--- a/lib/client/gnt_node.py
+++ b/lib/client/gnt_node.py
@@ -960,8 +960,11 @@ def ListDrbd(opts, args):
     return constants.EXIT_FAILURE
 
   fields = ["node", "minor", "instance", "disk", "role", "peer"]
-  headers = {"node": "Node", "minor": "Minor", "instance": "Instance",
-             "disk": "Disk", "role": "Role", "peer": "PeerNode"}
+  if opts.no_headers:
+    headers = None
+  else:
+    headers = {"node": "Node", "minor": "Minor", "instance": "Instance",
+               "disk": "Disk", "role": "Role", "peer": "PeerNode"}
 
   data = GenerateTable(separator=opts.separator, headers=headers,
                        fields=fields, data=sorted(status.answer),