diff --git a/src/oidcrp/__init__.py b/src/oidcrp/__init__.py
index df48331..453f389 100644
--- a/src/oidcrp/__init__.py
+++ b/src/oidcrp/__init__.py
@@ -824,7 +824,7 @@ def finalize(self, issuer, response):
             **userinfo** The collected user information
         """
 
-        client = self.issuer2rp[issuer]
+        client = self.client_setup(issuer)
 
         authorization_response = self.finalize_auth(client, issuer, response)
         if is_error_message(authorization_response):