diff --git a/rs/src/contracts/tunnel_endpoint.rs b/rs/src/contracts/tunnel_endpoint.rs
index aef96832..a0f8ee02 100644
--- a/rs/src/contracts/tunnel_endpoint.rs
+++ b/rs/src/contracts/tunnel_endpoint.rs
@@ -16,7 +16,7 @@ use serde::{Deserialize, Serialize};
 #[serde(rename_all(serialize = "camelCase", deserialize = "camelCase"))]
 pub struct TunnelEndpoint {
     // Gets or sets the ID of this endpoint.
-    pub id: Option<String>,
+    pub id: String,
 
     // Gets or sets the connection mode of the endpoint.
     //
diff --git a/rs/src/management/http_client.rs b/rs/src/management/http_client.rs
index 68d60e8a..0e8b2d5d 100644
--- a/rs/src/management/http_client.rs
+++ b/rs/src/management/http_client.rs
@@ -183,8 +183,8 @@ impl TunnelManagementClient {
         let url = self.build_tunnel_uri(
             locator,
             Some(&format!(
-                "{}/{}/{}",
-                ENDPOINTS_API_SUB_PATH, endpoint.base.host_id, endpoint.base.connection_mode
+                "{}/{}",
+                ENDPOINTS_API_SUB_PATH, endpoint.base.id
             )),
         );
         let mut request = self.make_tunnel_request(Method::PUT, url, options).await?;