diff --git a/packages/issuer-rest/lib/oid4vci-api-functions.ts b/packages/issuer-rest/lib/oid4vci-api-functions.ts
index 8228fccf..5e0a5fa8 100644
--- a/packages/issuer-rest/lib/oid4vci-api-functions.ts
+++ b/packages/issuer-rest/lib/oid4vci-api-functions.ts
@@ -406,7 +406,7 @@ export function getMetadataEndpoints<DIDDoc extends object>(router: Router, issu
   router.get(WellKnownEndpoints.OAUTH_AS, authorizationServerHandler)
   
   const openidFederationHandler = (request: Request, response: Response) => {
-    if(!issuer.openidFederationMetadata) {
+    if(!issuer.openidFederationMetadata || !issuer.openidFederationMetadata.jwt) {
       return response.status(404).send()
     }
     return response.send(issuer.openidFederationMetadata.jwt)