diff --git a/android/virtmgr/src/aidl.rs b/android/virtmgr/src/aidl.rs
index 23652d2..c587df9 100644
--- a/android/virtmgr/src/aidl.rs
+++ b/android/virtmgr/src/aidl.rs
@@ -447,7 +447,7 @@
 
         // Start VM service listening for connections from the new CID on port=CID.
         let port = cid;
-        let vm_server = RpcServer::new_vsock(service, cid, port)
+        let (vm_server, _) = RpcServer::new_vsock(service, cid, port)
             .context(format!("Could not start RpcServer on port {port}"))
             .or_service_specific_exception(-1)?;
         vm_server.start();
@@ -469,7 +469,7 @@
             // Start VM service listening for connections from the new CID on port=CID.
             let port = cid;
             match RpcServer::new_vsock(service, cid, port) {
-                Ok(vm_server) => {
+                Ok((vm_server, _)) => {
                     vm_server.start();
                     return Ok((VmContext::new(vm_context, vm_server), cid, temp_dir));
                 }
