diff --git a/src/data.rs b/src/data.rs
index f0c4de3..4b0c522 100644
--- a/src/data.rs
+++ b/src/data.rs
@@ -272,9 +272,9 @@ impl BrainData {
         mut req: grpc::NewVmReq,
         tx: OneshotSender<grpc::NewVmResp>,
     ) {
-        let uuid = uuid::Uuid::new_v4().to_string();
-
-        req.uuid = uuid.clone();
+        if req.uuid.is_empty() {
+           req.uuid = uuid::Uuid::new_v4().to_string();
+        }
         info!("Inserting new vm request in memory: {req:?}");
         self.tmp_newvm_reqs
             .insert(req.uuid.clone(), (req.clone(), tx));
@@ -292,7 +292,7 @@ impl BrainData {
                 );
                 self.submit_newvm_resp(grpc::NewVmResp {
                     error: "Daemon is offline.".to_string(),
-                    uuid,
+                    uuid: req.uuid,
                     exposed_ports: Vec::new(),
                     ovmf_hash: "".to_string(),
                     ips: Vec::new(),