diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index bf9fe53d61..1318053a8e 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -2,6 +2,16 @@
 Synapse Changelog
 *****************
 
+v2.1.1 - 2020-06-16
+===================
+
+Bugfixes
+--------
+
+- Fix an issue in the autodoc tool which failed to account for Storm Service commands without cmdargs.
+  (`#1775 <https://github.com/vertexproject/synapse/pull/1775>`_)
+
+
 v2.1.0 - 2020-06-16
 ===================
 
diff --git a/synapse/tools/autodoc.py b/synapse/tools/autodoc.py
index fa55607bfa..a46e748041 100644
--- a/synapse/tools/autodoc.py
+++ b/synapse/tools/autodoc.py
@@ -499,8 +499,9 @@ def get(self, key):
 
                 # Generate help from args
                 pars = s_storm.Parser(prog=cname, descr=cdesc)
-                for (argname, arginfo) in cargs:
-                    pars.add_argument(argname, **arginfo)
+                if cargs:
+                    for (argname, arginfo) in cargs:
+                        pars.add_argument(argname, **arginfo)
                 pars.help()
 
                 for line in pars.mesgs: