diff --git a/gateway/src/gateway.cpp b/gateway/src/gateway.cpp
index 4874ca3..b141d9a 100644
--- a/gateway/src/gateway.cpp
+++ b/gateway/src/gateway.cpp
@@ -44,15 +44,15 @@ void loop() {
 }
 
 bool buildSensorJson(JsonDocument& jsonDoc, unsigned long value) {
-	jsonDoc["id"] = ID(value);
+	JsonObject sensor = jsonDoc.createNestedObject("sensor");
+	sensor["id"] = ID(value);
 
 	float voltage = (float)GET_VCC(value) / 1000;
 	if (voltage != 0) {
-		JsonObject diagnostic = jsonDoc.createNestedObject("diagnostic");
+		JsonObject diagnostic = sensor.createNestedObject("diagnostic");
 		diagnostic["voltage"] = voltage;
 	}
 
-	JsonObject sensor = jsonDoc.createNestedObject("sensor");
 	switch (GET_TYPE(value)) {
 	case SensorType::GENERIC:
 		sensor["value"] = GET_VALUE(value);