diff --git a/unitstatushandler/unitstatushandler.go b/unitstatushandler/unitstatushandler.go
index efaa3efd..f753d8aa 100644
--- a/unitstatushandler/unitstatushandler.go
+++ b/unitstatushandler/unitstatushandler.go
@@ -358,10 +358,13 @@ func (instance *Instance) CloudDisconnected() {
 
 func (instance *Instance) resetUnitStatus() {
 	instance.unitStatus = cloudprotocol.UnitStatus{
-		Components:   make([]cloudprotocol.ComponentStatus, 0),
-		Layers:       make([]cloudprotocol.LayerStatus, 0),
+		MessageType:  cloudprotocol.UnitStatusMessageType,
+		UnitConfig:   make([]cloudprotocol.UnitConfigStatus, 0),
+		Nodes:        make([]cloudprotocol.NodeInfo, 0),
 		Services:     make([]cloudprotocol.ServiceStatus, 0),
 		Instances:    make([]cloudprotocol.InstanceStatus, 0),
+		Layers:       make([]cloudprotocol.LayerStatus, 0),
+		Components:   make([]cloudprotocol.ComponentStatus, 0),
 		UnitSubjects: make([]string, 0),
 	}
 }