diff --git a/src/main/kotlin/id/walt/service/credentials/CredentialsService.kt b/src/main/kotlin/id/walt/service/credentials/CredentialsService.kt
index cb8474d..ea428ed 100644
--- a/src/main/kotlin/id/walt/service/credentials/CredentialsService.kt
+++ b/src/main/kotlin/id/walt/service/credentials/CredentialsService.kt
@@ -78,7 +78,7 @@ object CredentialsService {
     } ?: let {
         CredentialsRepository.insert(
             DbCredential(
-                credentialId = URLEncoder.encode(credentialId, "UTF-8"),
+                credentialId = credentialId,
                 document = document,
             )
         )
diff --git a/web/src/pages/credentials/[credentialId].vue b/web/src/pages/credentials/[credentialId].vue
index 67860f2..91db944 100644
--- a/web/src/pages/credentials/[credentialId].vue
+++ b/web/src/pages/credentials/[credentialId].vue
@@ -354,13 +354,13 @@ const {
     pending,
     refresh,
     error,
-} = await useLazyFetch(`/r/wallet/credentials/${credentialId}`);
+} = await useLazyFetch(`/r/wallet/credentials/${encodeURIComponent(credentialId)}`);
 refreshNuxtData();
 
 useHead({title: "View credential - walt.id"});
 
 async function deleteCredential() {
-    await $fetch(`/r/wallet/credentials/${credentialId}`, {
+    await $fetch(`/r/wallet/credentials/${encodeURIComponent(credentialId)}`, {
         method: "DELETE",
     });
     await navigateTo({path: "/"});
diff --git a/web/src/pages/index.vue b/web/src/pages/index.vue
index 21b1e7c..2de0edd 100644
--- a/web/src/pages/index.vue
+++ b/web/src/pages/index.vue
@@ -33,7 +33,7 @@
         <ul class="grid grid-cols-1 gap-6 sm:grid-cols-2 lg:grid-cols-3 mt-6" role="list">
           <li v-for="credential in credentials" :key="credential.id"
             class="col-span-1 divide-y divide-gray-200 rounded-lg bg-white shadow w-[96%] transform hover:scale-105 cursor-pointer duration-200">
-            <NuxtLink :to="'/credentials/' + credential.id">
+            <NuxtLink :to="'/credentials/' + encodeURIComponent(credential.id)">
               <div class="bg-white p-6 rounded-2xl shadow-2xl h-full">
                 <div class="flex justify-end">
                   <div