diff --git a/apps/web/src/api/index.ts b/apps/web/src/api/index.ts
index aab368b5a233c10718a5343eef2eaf1731b20e38..1a621a7fa68ca776382a5acba4c68e149bf61fe4 100644
--- a/apps/web/src/api/index.ts
+++ b/apps/web/src/api/index.ts
@@ -64,9 +64,10 @@ class GatewayApi {
       let eventId = "-1";
       const events = {};
       conf.fn = (message: GatewayMessageType) => {
-        console.log(new Date().getTime() + ' Received message: ', message);
+        console.log(new Date().getTime() + ' Received message: ', eventId, message);
         if (message.id === eventId) {
           // unsubscribe from events
+          console.log('Unsubscribe ' + eventId, conf.fn);
           this.events.off('message', conf.fn);
           clearTimeout(conf.timeoutId);
           conf.resolve({ status: 200, json: () => message.data });
@@ -81,6 +82,7 @@ class GatewayApi {
 
         conf.resolve = resolve;
         conf.timeoutId = setTimeout(() => {
+          console.log('Unsubscribe ' + eventId, conf.fn);
           this.events.off('message', conf.fn);
           reject(new Error('Timeout exception'));
         }, TIMEOUT);
@@ -88,12 +90,14 @@ class GatewayApi {
         const gatewayResponse = await fetch(url, init);
         const gatewayData = await gatewayResponse.json();
         eventId = gatewayData.id;
+        console.log('Sent request. Event id is: ' + eventId);
         if (events[eventId]) {
+
+          console.log('Unsubscribe ' + eventId, conf.fn);
           this.events.off('message', conf.fn);
           clearTimeout(conf.timeoutId);
           conf.resolve({ status: 200, json: () => events[eventId].data });
         }
-        console.log(new Date().getTime() + ' Received event id: ' + eventId);
       });
     };
 
diff --git a/libs/askar/src/agent.utils.ts b/libs/askar/src/agent.utils.ts
index 3eae5e959a039310952d4bdaadd5e631d6e54827..873bd5b10a802302e532aa0c7ea0942603f9affb 100644
--- a/libs/askar/src/agent.utils.ts
+++ b/libs/askar/src/agent.utils.ts
@@ -3,6 +3,7 @@ import {
   AutoAcceptCredential,
   AutoAcceptProof,
   ConnectionsModule,
+  MediatorModule,
   CredentialsModule,
   DidsModule,
   Key,
@@ -131,5 +132,8 @@ export const getAskarAnonCredsIndyModules = (networks: any) => {
     askar: new AskarModule({
       ariesAskar,
     }),
+    mediator: new MediatorModule({
+      autoAcceptMediationRequests: true,
+    }),
   } as const;
 };