diff --git a/apps/ssi-abstraction/src/agent/anoncredsCredentials/anoncredsCredentials.service.ts b/apps/ssi-abstraction/src/agent/anoncredsCredentials/anoncredsCredentials.service.ts
index 72fa3311d28cf1149d297781a35d75a3b754466a..1230d74b9f671c2bfc2161760572c4a13815ed0f 100644
--- a/apps/ssi-abstraction/src/agent/anoncredsCredentials/anoncredsCredentials.service.ts
+++ b/apps/ssi-abstraction/src/agent/anoncredsCredentials/anoncredsCredentials.service.ts
@@ -1,5 +1,8 @@
 import type { TenantAgent } from '../agent.service.js';
-import type { CredentialExchangeRecord } from '@credo-ts/core';
+import type {
+  CredentialExchangeRecord,
+  CredentialStateChangedEvent,
+} from '@credo-ts/core';
 import type {
   EventAnonCredsCredentialOfferGetAll,
   EventAnonCredsCredentialOfferGetAllInput,
@@ -19,17 +22,25 @@ import type {
   EventDidcommAnonCredsCredentialsOfferToSelfInput,
 } from '@ocm/shared';
 
-import { AutoAcceptCredential, CredentialState } from '@credo-ts/core';
+import {
+  AutoAcceptCredential,
+  CredentialState,
+  CredentialEventTypes,
+} from '@credo-ts/core';
 import { GenericRecord } from '@credo-ts/core/build/modules/generic-records/repository/GenericRecord.js';
 import { Injectable } from '@nestjs/common';
 import { logger } from '@ocm/shared';
 
 import { GenericRecordTokens, MetadataTokens } from '../../common/constants.js';
+import { AgentService } from '../agent.service.js';
 import { WithTenantService } from '../withTenantService.js';
 
 @Injectable()
 export class AnonCredsCredentialsService {
-  public constructor(private withTenantService: WithTenantService) {}
+  public constructor(
+    private withTenantService: WithTenantService,
+    private agentService: AgentService,
+  ) {}
 
   public async getAll({
     tenantId,
@@ -193,7 +204,50 @@ export class AnonCredsCredentialsService {
 
       const revocationRegistryIndex = await this.getNextRevocationIdx(t);
 
-      return t.credentials.offerCredential({
+      const acceptOfferListener = new Promise((resolve) => {
+        this.agentService.agent.events.on<CredentialStateChangedEvent>(
+          CredentialEventTypes.CredentialStateChanged,
+          async ({ payload: { credentialRecord } }) => {
+            const { connectionId } = credentialRecord;
+            if (
+              !connectionId ||
+              credentialRecord.state !== CredentialState.OfferReceived
+            ) {
+              return;
+            }
+
+            const connectionRecord = await t.connections.getById(connectionId);
+
+            const metadata = connectionRecord.metadata.get<{
+              withSelf: boolean;
+            }>(MetadataTokens.CONNECTION_METADATA_KEY);
+
+            if (!metadata || metadata.withSelf === false) return;
+
+            await t.credentials.acceptOffer({
+              credentialRecordId: credentialRecord.id,
+              autoAcceptCredential: AutoAcceptCredential.Always,
+            });
+
+            resolve(connectionRecord);
+          },
+        );
+      });
+
+      const waitUntilDone = new Promise<CredentialExchangeRecord>((resolve) =>
+        this.agentService.agent.events.on<CredentialStateChangedEvent>(
+          CredentialEventTypes.CredentialStateChanged,
+          ({ payload: { credentialRecord } }) => {
+            if (
+              credentialRecord.state === CredentialState.Done ||
+              credentialRecord.state === CredentialState.CredentialIssued
+            )
+              resolve(credentialRecord);
+          },
+        ),
+      );
+
+      void t.credentials.offerCredential({
         protocolVersion: 'v2',
         autoAcceptCredential: AutoAcceptCredential.Always,
         connectionId: connection.id,
@@ -206,6 +260,10 @@ export class AnonCredsCredentialsService {
           },
         },
       });
+
+      await acceptOfferListener;
+
+      return waitUntilDone;
     });
   }
 
diff --git a/apps/ssi-abstraction/src/agent/connections/connections.service.ts b/apps/ssi-abstraction/src/agent/connections/connections.service.ts
index 1b6f8c4d84531aea50a7b4700a1cafb71b05815a..7981414335eaa5fc2b92e32b2ae2e11582048e21 100644
--- a/apps/ssi-abstraction/src/agent/connections/connections.service.ts
+++ b/apps/ssi-abstraction/src/agent/connections/connections.service.ts
@@ -145,7 +145,17 @@ export class ConnectionsService {
       const outOfBandRecord = await t.oob.createInvitation();
       const invitation = outOfBandRecord.outOfBandInvitation;
 
-      void t.oob.receiveInvitation(invitation);
+      const { connectionRecord } = await t.oob.receiveInvitation(invitation);
+
+      if (connectionRecord) {
+        connectionRecord.metadata.set(MetadataTokens.CONNECTION_METADATA_KEY, {
+          trusted: true,
+          withSelf: true,
+        });
+
+        const connRepo = t.dependencyManager.resolve(ConnectionRepository);
+        await connRepo.update(t.context, connectionRecord);
+      }
 
       return new Promise((resolve) =>
         this.agent.events.on<ConnectionStateChangedEvent>(