diff --git a/src/plugins/cmakeprojectmanager/servermode.cpp b/src/plugins/cmakeprojectmanager/servermode.cpp
index 461a6f725e5..afb66796e4a 100644
--- a/src/plugins/cmakeprojectmanager/servermode.cpp
+++ b/src/plugins/cmakeprojectmanager/servermode.cpp
@@ -166,7 +166,7 @@ void ServerMode::sendRequest(const QString &type, const QVariantMap &extra, cons
     QJsonDocument document;
     document.setObject(object);
 
-    const QByteArray rawData = START_MAGIC + document.toJson() + END_MAGIC;
+    const QByteArray rawData = START_MAGIC + document.toJson(QJsonDocument::Compact) + END_MAGIC;
     qCDebug(cmakeServerMode) << ">>>" << rawData;
     m_cmakeSocket->write(rawData);
     m_cmakeSocket->flush();
diff --git a/src/plugins/cmakeprojectmanager/servermodereader.cpp b/src/plugins/cmakeprojectmanager/servermodereader.cpp
index d1ede8e62f2..eea7938ccf3 100644
--- a/src/plugins/cmakeprojectmanager/servermodereader.cpp
+++ b/src/plugins/cmakeprojectmanager/servermodereader.cpp
@@ -142,11 +142,12 @@ void ServerModeReader::parse(bool force)
 {
     QTC_ASSERT(m_cmakeServer, return);
     QVariantMap extra;
-    if (force)
+    if (force) {
         extra.insert("cacheArguments", QVariant(transform(m_parameters.configuration,
                                                  [this](const CMakeConfigItem &i) {
             return i.toArgument(m_parameters.expander);
         })));
+    }
 
     m_future.reset(new QFutureInterface<void>());
     m_future->setProgressRange(0, MAX_PROGRESS);