diff --git a/src/Item/Get-CredentialStoreItem.ps1 b/src/Item/Get-CredentialStoreItem.ps1
index c20bdb9..f82f581 100644
--- a/src/Item/Get-CredentialStoreItem.ps1
+++ b/src/Item/Get-CredentialStoreItem.ps1
@@ -89,9 +89,7 @@ function Get-CredentialStoreItem {
             if (($CSMembers.MemberType -eq "NoteProperty") -and ($CSMembers.Name -contains $CredentialName)) {
                 try {
                     if ($null -eq $CS.PfxCertificate) {
-                        $Cert = Get-ChildItem -Recurse -Path 'Cert:' | Where-Object {
-                            $_.Thumbprint -eq $CS.Thumbprint
-                        } | Select-Object -First 1
+                        $Cert = Get-CSCertificate -Thumbprint $CS.Thumbprint
                     }
                     else {
                         $Cert = Get-PfxCertificate -FilePath $CS.PfxCertificate -ErrorAction Stop
diff --git a/src/Item/Set-CredentialStoreItem.ps1 b/src/Item/Set-CredentialStoreItem.ps1
index a340e93..313857e 100644
--- a/src/Item/Set-CredentialStoreItem.ps1
+++ b/src/Item/Set-CredentialStoreItem.ps1
@@ -104,9 +104,7 @@ function Set-CredentialStoreItem {
         if ($Credential.UserName) {
             try {
                 if ($null -eq $CSContent.PfxCertificate) {
-                    $Cert = Get-ChildItem -Recurse -Path 'Cert:' | Where-Object {
-                        $_.Thumbprint -eq $CSContent.Thumbprint
-                    } | Select-Object -First 1
+                    $Cert = Get-CSCertificate -Thumbprint $CSContent.Thumbprint
                 }
                 else {
                     $Cert = Get-PfxCertificate -FilePath $CSContent.PfxCertificate -ErrorAction Stop