diff --git a/packages/protocol/contracts/identity/Attestations.sol b/packages/protocol/contracts/identity/Attestations.sol
index 1551fe80c10..c3758e906b0 100644
--- a/packages/protocol/contracts/identity/Attestations.sol
+++ b/packages/protocol/contracts/identity/Attestations.sol
@@ -95,10 +95,10 @@ contract Attestations is
     address attestationRequestFeeToken
   );
 
-  event AttestationIssuersSelected(
+  event AttestationIssuerSelected(
     bytes32 indexed identifier,
     address indexed account,
-    uint256 attestationsRequested,
+    address indexed issuer,
     address attestationRequestFeeToken
   );
 
@@ -204,13 +204,6 @@ contract Attestations is
     );
 
     addIncompleteAttestations(identifier);
-    emit AttestationIssuersSelected(
-      identifier,
-      msg.sender,
-      state.unselectedRequests[msg.sender].attestationsRequested,
-      state.unselectedRequests[msg.sender].attestationRequestFeeToken
-    );
-
     delete state.unselectedRequests[msg.sender];
   }
 
@@ -590,6 +583,13 @@ contract Attestations is
       attestation.blockNumber = unselectedRequest.blockNumber;
       attestation.attestationRequestFeeToken = unselectedRequest.attestationRequestFeeToken;
       state.selectedIssuers.push(issuer);
+
+      emit AttestationIssuerSelected(
+        identifier,
+        msg.sender,
+        issuer,
+        unselectedRequest.attestationRequestFeeToken
+      );
     }
   }
 
diff --git a/packages/protocol/test/identity/attestations.ts b/packages/protocol/test/identity/attestations.ts
index 6b712d66c50..ebed62fd29a 100644
--- a/packages/protocol/test/identity/attestations.ts
+++ b/packages/protocol/test/identity/attestations.ts
@@ -459,19 +459,21 @@ contract('Attestations', (accounts: string[]) => {
           assertEqualBN(actualAttestationsRequested, 0)
         })
 
-        it('should emit the AttestationIssuersSelected event', async () => {
+        it('should emit the AttestationIssuerSelected event', async () => {
           const response = await attestations.selectIssuers(phoneHash)
-
-          assert.lengthOf(response.logs, 1)
-          const event = response.logs[0]
-          assertLogMatches2(event, {
-            event: 'AttestationIssuersSelected',
-            args: {
-              identifier: phoneHash,
-              account: caller,
-              attestationsRequested: new BigNumber(attestationsRequested),
-              attestationRequestFeeToken: mockStableToken.address,
-            },
+          const issuers = await attestations.getAttestationIssuers(phoneHash, caller)
+          assert.lengthOf(response.logs, 3)
+
+          issuers.forEach((issuer, index) => {
+            assertLogMatches2(response.logs[index], {
+              event: 'AttestationIssuerSelected',
+              args: {
+                identifier: phoneHash,
+                account: caller,
+                issuer,
+                attestationRequestFeeToken: mockStableToken.address,
+              },
+            })
           })
         })