diff --git a/doc/help/commands.asciidoc b/doc/help/commands.asciidoc
index 71929d2aa..2d42606f0 100644
--- a/doc/help/commands.asciidoc
+++ b/doc/help/commands.asciidoc
@@ -217,7 +217,7 @@ Set all settings back to their default.
 
 [[config-cycle]]
 === config-cycle
-Syntax: +:config-cycle [*--temp*] [*--print*] 'option' 'values' ['values' ...]+
+Syntax: +:config-cycle [*--temp*] [*--print*] 'option' ['values' ['values' ...]]+
 
 Cycle an option between multiple values.
 
diff --git a/qutebrowser/config/configcommands.py b/qutebrowser/config/configcommands.py
index e496f693b..0eb93387e 100644
--- a/qutebrowser/config/configcommands.py
+++ b/qutebrowser/config/configcommands.py
@@ -135,7 +135,7 @@ class ConfigCommands:
         except configexc.KeybindingError as e:
             raise cmdexc.CommandError('unbind: {}'.format(e))
 
-    @cmdutils.register(instance='config-commands')
+    @cmdutils.register(instance='config-commands', star_args_optional=True)
     @cmdutils.argument('option', completion=configmodel.option)
     @cmdutils.argument('values', completion=configmodel.value)
     def config_cycle(self, option, *values, temp=False, print_=False):