diff --git a/src/client.py b/src/client.py
index 2275dd111..a36b6d587 100755
--- a/src/client.py
+++ b/src/client.py
@@ -756,7 +756,10 @@ def gen(meta=False):
                 data = list(gen())
                 fmt_str = calc_fmtstr(attrs, data)
         else:
-                data = gen()
+                data = list(gen())
+
+        if len(data) == 0:
+                omit_headers = True
 
         format_output(attrs, fields, data, output_format, fmt_str, omit_headers)