diff --git a/platform/queue/command_queued.go b/platform/queue/command_queued.go
index 33fb504e..2d8ad98c 100644
--- a/platform/queue/command_queued.go
+++ b/platform/queue/command_queued.go
@@ -18,7 +18,7 @@ func MarshalQueuedCommand(cq *QueueCommandQueued) ([]byte, error) {
 	}
 	return proto.Marshal(&commandqueued.CommandQueued{
 		DeviceUdid:  cq.DeviceUDID,
-		CommandUuid: cq.DeviceUDID,
+		CommandUuid: cq.CommandUUID,
 	})
 }