diff --git a/oidc-ui/src/components/Pin.js b/oidc-ui/src/components/Pin.js
index b9b09153d..c0128735f 100644
--- a/oidc-ui/src/components/Pin.js
+++ b/oidc-ui/src/components/Pin.js
@@ -97,16 +97,6 @@ export default function Pin({
       );
 
       setStatus(states.LOADED);
-      let nonce = openIDConnectService.getNonce();
-      let state = openIDConnectService.getState();
-      let params = buildRedirectParams(
-        nonce,
-        state,
-        openIDConnectService.getOAuthDetails()
-      );
-      navigate(process.env.PUBLIC_URL + "/claims-details" + params, {
-        replace: true,
-      });
 
       const { response, errors } = authenticateResponse;
 
@@ -133,24 +123,25 @@ export default function Pin({
       } else {
         setErrorBanner(null);
 
-        // let nonce = openIDConnectService.getNonce();
-        // let state = openIDConnectService.getState();
+        let nonce = openIDConnectService.getNonce();
+        let state = openIDConnectService.getState();
+
+        let params = buildRedirectParams(
+          nonce,
+          state,
+          openIDConnectService.getOAuthDetails(),
+          response.consentAction
+        );
 
-        // let params = buildRedirectParams(
-        //   nonce,
-        //   state,
-        //   openIDConnectService.getOAuthDetails(),
-        //   response.consentAction
-        // );
 
         //TODO navigate to specific url based on the response
         // navigate(process.env.PUBLIC_URL + "/consent" + params, {
         //   replace: true,
         // });
 
-        // navigate(process.env.PUBLIC_URL + "/claims-details" + params, {
-        //   replace: true,
-        // });
+        navigate(process.env.PUBLIC_URL + "/claims-details" + params, {
+          replace: true,
+        });
       }
     } catch (error) {
       setErrorBanner({