diff --git a/shared/openId4VCI/Utils.ts b/shared/openId4VCI/Utils.ts
index d0485c1a..70834e0e 100644
--- a/shared/openId4VCI/Utils.ts
+++ b/shared/openId4VCI/Utils.ts
@@ -91,7 +91,7 @@ export const updateCredentialInformation = async (
       credentialConfigurationId: context.selectedCredentialType.id,
       issuerLogo: getDisplayObjectForCurrentLanguage(
         context.selectedIssuer.display,
-      )?.logo,
+      )?.logo ?? "",
       processedCredential,
     };
   } catch (e) {
@@ -113,9 +113,12 @@ export const updateCredentialInformation = async (
 };
 
 export const getDisplayObjectForCurrentLanguage = (
-  display: [displayType],
+  display: displayType[],
 ): displayType => {
   const currentLanguage = i18next.language;
+  if (!display || display.length === 0) {
+    return {} as displayType;
+  }
   const languageKey = Object.keys(display[0]).includes('language')
     ? 'language'
     : 'locale';