diff --git a/src/components/Issuance/IssuedCrdentials.tsx b/src/components/Issuance/IssuedCrdentials.tsx
index 95ebd77c..b10b846d 100644
--- a/src/components/Issuance/IssuedCrdentials.tsx
+++ b/src/components/Issuance/IssuedCrdentials.tsx
@@ -170,14 +170,15 @@ const CredentialList = () => {
 		const response = await getOrganizationById(orgId);
 		const { data } = response as AxiosResponse;
 		if (data?.statusCode === apiStatusCodes.API_STATUS_SUCCESS) {
-			const did = data?.data?.org_agents?.[0]?.orgDid;
-
-			await setToLocalStorage(storageKeys.ORG_DID, did)
-			if (did.includes(DidMethod.POLYGON) || did.includes(DidMethod.KEY) || did.includes(DidMethod.WEB)) {
-				setW3CSchema(true);
-			}
-			if (did.includes(DidMethod.INDY)) {
-				setW3CSchema(false);
+			const did = data?.data?.org_agents[0]?.orgDid;
+			if (did) {
+				await setToLocalStorage(storageKeys.ORG_DID, did)
+				if (did.includes(DidMethod.POLYGON) || did.includes(DidMethod.KEY) || did.includes(DidMethod.WEB)) {
+					setW3CSchema(true);
+				}
+				if (did.includes(DidMethod.INDY)) {
+					setW3CSchema(false);
+				}
 			}
 		}
 		setLoading(false);