diff --git a/web/src/pages/credentials/[credentialId].vue b/web/src/pages/credentials/[credentialId].vue
index 91db944..afccbd6 100644
--- a/web/src/pages/credentials/[credentialId].vue
+++ b/web/src/pages/credentials/[credentialId].vue
@@ -32,12 +32,12 @@
                             )
                         }}
                     </h2>
-                    <div class="flex items-center">
+                    <div v-if="jwtJson.vc.issuer" class="flex items-center">
                         <img :src="jwtJson.vc.issuer?.image?.id ? jwtJson.vc.issuer?.image?.id : jwtJson.vc.issuer?.image"
                              class="w-12"
                         />
                         <div class="text-natural-600 ml-2 w-32">
-                            {{ jwtJson.vc.issuer.name }}
+                            {{ jwtJson.vc.issuer?.name }}
                         </div>
                     </div>
                 </div>
@@ -249,15 +249,17 @@
                 </div>
 
                 <hr class="my-5"/>
-                <div class="text-gray-500 mb-4 font-bold">Issuer</div>
-                <div class="md:flex text-gray-500 mb-3 md:mb-1">
-                    <div class="min-w-[19vw]">Name</div>
-                    <div class="font-bold">{{ jwtJson.vc.issuer.name }}</div>
-                </div>
-                <div class="md:flex text-gray-500 mb-3 md:mb-1">
-                    <div class="min-w-[19vw]">DID</div>
-                    <div class="font-bold overflow-scroll lg:overflow-auto">
-                        {{ jwtJson.vc.issuer.id }}
+                <div v-if="jwtJson.vc.issuer">
+                    <div class="text-gray-500 mb-4 font-bold">Issuer</div>
+                    <div class="md:flex text-gray-500 mb-3 md:mb-1">
+                        <div class="min-w-[19vw]">Name</div>
+                        <div class="font-bold">{{ jwtJson.vc.issuer?.name }}</div>
+                    </div>
+                    <div class="md:flex text-gray-500 mb-3 md:mb-1">
+                        <div class="min-w-[19vw]">DID</div>
+                        <div class="font-bold overflow-scroll lg:overflow-auto">
+                            {{ jwtJson.vc.issuer?.id }}
+                        </div>
                     </div>
                 </div>
                 <hr class="mt-5 mb-3"/>
diff --git a/web/src/pages/index.vue b/web/src/pages/index.vue
index 2de0edd..eb2cd14 100644
--- a/web/src/pages/index.vue
+++ b/web/src/pages/index.vue
@@ -57,13 +57,13 @@
                     )
                   }}
                 </h2>
-                <div class="flex items-center">
+                <div v-if="credential.issuer" class="flex items-center">
                   <img class="w-12" :src="credential.issuer?.image?.id
                         ? credential.issuer?.image?.id
                         : credential.issuer?.image
                       " />
                   <div class="text-natural-600 ml-2 w-32">
-                    {{ credential.issuer.name }}
+                    {{ credential.issuer?.name }}
                   </div>
                 </div>
               </div>