diff --git a/pmp-reactjs-ui/src/pages/authenticationServices/OidcClientsList.js b/pmp-reactjs-ui/src/pages/authenticationServices/OidcClientsList.js
index 5af31b144..31e6d262e 100644
--- a/pmp-reactjs-ui/src/pages/authenticationServices/OidcClientsList.js
+++ b/pmp-reactjs-ui/src/pages/authenticationServices/OidcClientsList.js
@@ -338,7 +338,7 @@ function OidcClientsList() {
                                                                                     )
                                                                                 }
                                                                                 {showDeactivatePopup && (
-                                                                                    <DeactivatePopup closePopUp={closeDeactivatePopup} clientData={client} request={deactivateRequest} headerMsg='deactivateOidcClient.oidcClientName' descriptionMsg='deactivateOidcClient.description' clientName={client.oidcClientName}></DeactivatePopup>
+                                                                                    <DeactivatePopup closePopUp={closeDeactivatePopup} popupData={client} request={deactivateRequest} headerMsg='deactivateOidcClient.oidcClientName' descriptionMsg='deactivateOidcClient.description' headerKeyName={client.oidcClientName}></DeactivatePopup>
                                                                                 )}
                                                                             </div>
                                                                         )}
diff --git a/pmp-reactjs-ui/src/pages/common/DeactivatePopup.js b/pmp-reactjs-ui/src/pages/common/DeactivatePopup.js
index fb8ef0246..f83baa448 100644
--- a/pmp-reactjs-ui/src/pages/common/DeactivatePopup.js
+++ b/pmp-reactjs-ui/src/pages/common/DeactivatePopup.js
@@ -24,10 +24,6 @@ function DeactivatePopup({ closePopUp, popupData, request, headerMsg, descriptio
         closePopUp()
     };
 
-    if (popupData.isDeactivateSbi) {
-        var countOfDevicesGetDeactivate = JSON.parse(popupData.countOfApprovedDevices)
-    }
-
     const clickOnConfirm = async () => {
         setErrorCode("");
         setErrorMsg("");