diff --git a/src/cc/ClientStatus.cpp b/src/cc/ClientStatus.cpp
index 42182cc2..7f84d8cd 100644
--- a/src/cc/ClientStatus.cpp
+++ b/src/cc/ClientStatus.cpp
@@ -377,7 +377,7 @@ bool ClientStatus::parseFromJson(const rapidjson::Document& document)
 
     if (document.HasMember("client_status"))
     {
-        rapidjson::Value::ConstObject clientStatus = document["client_status"].GetObject();
+        const rapidjson::Value& clientStatus = document["client_status"];
 
         if (clientStatus.HasMember("current_status")) {
             m_currentStatus = toStatus(clientStatus["current_status"].GetString());
diff --git a/src/cc/ControlCommand.cpp b/src/cc/ControlCommand.cpp
index aeb5c4de..afdda3dd 100644
--- a/src/cc/ControlCommand.cpp
+++ b/src/cc/ControlCommand.cpp
@@ -58,7 +58,7 @@ bool ControlCommand::parseFromJson(const rapidjson::Document& document)
     bool result = false;
 
     if (document.HasMember("control_command")) {
-        rapidjson::Value::ConstObject controlCommand = document["control_command"].GetObject();
+        const rapidjson::Value& controlCommand = document["control_command"];
         if (controlCommand.HasMember("command")) {
             m_command = toCommand(controlCommand["command"].GetString());
             result = true;