diff --git a/src/controllers/credentials/CredentialController.ts b/src/controllers/credentials/CredentialController.ts
index 150a9f6b..41fb3c1d 100644
--- a/src/controllers/credentials/CredentialController.ts
+++ b/src/controllers/credentials/CredentialController.ts
@@ -219,6 +219,7 @@ export class CredentialController extends Controller {
         messages: [credentialMessage],
         autoAcceptConnection: true,
         imageUrl: outOfBandOption?.imageUrl,
+        goalCode: outOfBandOption?.goalCode,
         invitationDid,
       })
       return {
@@ -229,6 +230,8 @@ export class CredentialController extends Controller {
           useDidSovPrefixWhereAllowed: this.agent.config.useDidSovPrefixWhereAllowed,
         }),
         outOfBandRecord: outOfBandRecord.toJSON(),
+        outOfBandRecordId: outOfBandRecord.id,
+        credentialRequestThId: offerOob.credentialRecord.threadId,
         invitationDid: outOfBandOption?.invitationDid ? '' : invitationDid,
       }
     } catch (error) {
diff --git a/src/events/CredentialEvents.ts b/src/events/CredentialEvents.ts
index e266da51..7ee22e27 100644
--- a/src/events/CredentialEvents.ts
+++ b/src/events/CredentialEvents.ts
@@ -18,19 +18,26 @@ export const credentialEvents = async (agent: Agent<RestMultiTenantAgentModules>
       credentialData: null,
     }
 
-    if (event.metadata.contextCorrelationId !== 'default' && record?.connectionId) {
+    if (event.metadata.contextCorrelationId !== 'default') {
       await agent.modules.tenants.withTenantAgent(
         { tenantId: event.metadata.contextCorrelationId },
         async (tenantAgent) => {
-          const connectionRecord = await tenantAgent.connections.findById(record.connectionId!)
+          if (record?.connectionId) {
+            const connectionRecord = await tenantAgent.connections.findById(record.connectionId!)
+            body.outOfBandId = connectionRecord?.outOfBandId
+          }
           const data = await tenantAgent.credentials.getFormatData(record.id)
           body.credentialData = data
-          body.outOfBandId = connectionRecord?.outOfBandId
         }
       )
     }
 
     if (event.metadata.contextCorrelationId === 'default') {
+      if (record?.connectionId) {
+        const connectionRecord = await agent.connections.findById(record.connectionId!)
+        body.outOfBandId = connectionRecord?.outOfBandId
+      }
+
       const data = await agent.credentials.getFormatData(record.id)
       body.credentialData = data
     }
@@ -50,4 +57,4 @@ export const credentialEvents = async (agent: Agent<RestMultiTenantAgentModules>
       })
     }
   })
-}
\ No newline at end of file
+}