diff --git a/lib/ansible/cli/doc.py b/lib/ansible/cli/doc.py
index 7f9ba3f2f6..dab8677d14 100644
--- a/lib/ansible/cli/doc.py
+++ b/lib/ansible/cli/doc.py
@@ -312,11 +312,13 @@ class DocCLI(CLI):
 
             aliases = ''
             if 'aliases' in opt:
-                choices = "(Aliases: " + ", ".join(str(i) for i in opt['aliases']) + ")"
+                if len(opt['aliases']) > 0:
+                    aliases = "(Aliases: " + ", ".join(str(i) for i in opt['aliases']) + ")"
                 del opt['aliases']
             choices = ''
             if 'choices' in opt:
-                choices = "(Choices: " + ", ".join(str(i) for i in opt['choices']) + ")"
+                if len(opt['choices']) > 0:
+                    choices = "(Choices: " + ", ".join(str(i) for i in opt['choices']) + ")"
                 del opt['choices']
             default = ''
             if 'default' in opt or not required: