diff --git a/rpserver/src/main/java/com/linecorp/line/auth/fido/fido2/rpserver/controller/CredentialController.java b/rpserver/src/main/java/com/linecorp/line/auth/fido/fido2/rpserver/controller/CredentialController.java
index bd67cf2..a8a4007 100644
--- a/rpserver/src/main/java/com/linecorp/line/auth/fido/fido2/rpserver/controller/CredentialController.java
+++ b/rpserver/src/main/java/com/linecorp/line/auth/fido/fido2/rpserver/controller/CredentialController.java
@@ -81,7 +81,7 @@ public GetCredentialResult getCredentialWithCredentialId(
             @PathVariable("id") String credentialId) {
 
         UriComponentsBuilder uriComponentsBuilder = UriComponentsBuilder.fromUriString(getDeleteCredentialsUri);
-        URI uri = uriComponentsBuilder.path(credentialId)
+        URI uri = uriComponentsBuilder.pathSegment(credentialId)
                                       .queryParam("rpId", rpId)
                                       .build().toUri();
 
@@ -112,7 +112,7 @@ public BaseResponse deleteCredentialWithCredentialId(
             @PathVariable("id") String credentialId) {
 
         UriComponentsBuilder uriComponentsBuilder = UriComponentsBuilder.fromUriString(getDeleteCredentialsUri);
-        URI uri = uriComponentsBuilder.path(credentialId)
+        URI uri = uriComponentsBuilder.pathSegment(credentialId)
                                       .queryParam("rpId", rpId)
                                       .build().toUri();