diff --git a/lib/base/clicommand.cpp b/lib/base/clicommand.cpp
index 696eab613..01e718635 100644
--- a/lib/base/clicommand.cpp
+++ b/lib/base/clicommand.cpp
@@ -68,6 +68,8 @@ bool CLICommand::ParseCommand(int argc, char **argv, po::options_description& de
 {
 	boost::mutex::scoped_lock lock(l_RegistryMutex);
 
+	autocomplete = false;
+	
 	typedef std::map<std::vector<String>, CLICommand::Ptr>::value_type CLIKeyValue;
 
 	std::vector<String> best_match;