diff --git a/CommandLineInterface.cpp b/CommandLineInterface.cpp
index 0cc1ab259..d5ff7b297 100644
--- a/CommandLineInterface.cpp
+++ b/CommandLineInterface.cpp
@@ -380,6 +380,9 @@ bool CommandLineInterface::processInput()
 
 void CommandLineInterface::handleCombinedJSON()
 {
+	if (!m_args.count("combined-json"))
+		return;
+
 	Json::Value output(Json::objectValue);
 
 	set<string> requests;