diff --git a/lib/cli/clicommand.cpp b/lib/cli/clicommand.cpp
index d4e830a04..714729220 100644
--- a/lib/cli/clicommand.cpp
+++ b/lib/cli/clicommand.cpp
@@ -207,7 +207,7 @@ found_command:
 		visibleDesc.add(vdesc);
 	}
 
-	if (autocomplete)
+	if (autocomplete || !command)
 		return true;
 
 	po::options_description adesc;