diff --git a/sdk/keyvault/azure-security-keyvault-certificates/README.md b/sdk/keyvault/azure-security-keyvault-certificates/README.md
index 0a6a66342..c717b8908 100644
--- a/sdk/keyvault/azure-security-keyvault-certificates/README.md
+++ b/sdk/keyvault/azure-security-keyvault-certificates/README.md
@@ -82,13 +82,6 @@ CertificateCreateParameters params;
 // start the create process
 auto response = certificateClient.StartCreateCertificate(certificateName, params);
 auto result = response.PollUntilDone(defaultWait);
-
-// check that the operation completed
-while (!response.IsCompleted())
-{
-  response.UpdateProperties();
-  std::this_thread::sleep_for(defaultWait);
-}
 ```
 
 ### Getting a Certificate
diff --git a/sdk/keyvault/azure-security-keyvault-certificates/inc/azure/keyvault/certificates/certificate_client_operations.hpp b/sdk/keyvault/azure-security-keyvault-certificates/inc/azure/keyvault/certificates/certificate_client_operations.hpp
index 973f6f3f4..1a9d3d8aa 100644
--- a/sdk/keyvault/azure-security-keyvault-certificates/inc/azure/keyvault/certificates/certificate_client_operations.hpp
+++ b/sdk/keyvault/azure-security-keyvault-certificates/inc/azure/keyvault/certificates/certificate_client_operations.hpp
@@ -64,19 +64,13 @@ namespace Azure { namespace Security { namespace KeyVault { namespace Certificat
 
   public:
     /**
-     * @brief Get the #Azure::Security::KeyVault::Certificates::KeyVaultCertificateWithPolicy
+     * @brief Get the #Azure::Security::KeyVault::Certificates::CertificateOperationProperties
      * object.
      *
-     * @return A certificate object.
+     * @return A CertificateOperationProperties object.
      */
     CertificateOperationProperties Value() const override { return m_value; }
 
-    /**
-     * @brief Get the properties of the pending certificate operation.
-     *
-     */
-    CertificateOperationProperties Properties;
-
     /**
      * @brief Get an Url as string which can be used to get the status of the
      * operation.
@@ -103,15 +97,6 @@ namespace Azure { namespace Security { namespace KeyVault { namespace Certificat
         CertificateClient const& client,
         Azure::Core::Context const& context = Azure::Core::Context());
 
-    /**
-     * @brief Updates the properties of the operation by querying the key vault.
-     *
-     * @param context A #Azure::Core::Context controlling the request lifetime.
-     * @return updated properties
-     */
-    CertificateOperationProperties UpdateProperties(
-        Azure::Core::Context const& context = Azure::Core::Context());
-
     /**
      * @brief Cancels the operation.
      *
diff --git a/sdk/keyvault/azure-security-keyvault-certificates/samples/certificate-GetCertificates/README.md b/sdk/keyvault/azure-security-keyvault-certificates/samples/certificate-GetCertificates/README.md
index 1096ad224..8e297719e 100644
--- a/sdk/keyvault/azure-security-keyvault-certificates/samples/certificate-GetCertificates/README.md
+++ b/sdk/keyvault/azure-security-keyvault-certificates/samples/certificate-GetCertificates/README.md
@@ -43,13 +43,6 @@ auto params = CertificateCreateParameters();
 // start the create process
 auto response = certificateClient.StartCreateCertificate(certificateName, params);
 auto result = response.PollUntilDone(defaultWait);
-
-// check that the operation completed
-while (!response.IsCompleted())
-{
-  response.UpdateProperties();
-  std::this_thread::sleep_for(defaultWait);
-}
 ```
 
 ## Getting properties of Certificates
diff --git a/sdk/keyvault/azure-security-keyvault-certificates/samples/certificate-GetCertificates/certificate-GetCertificates.cpp b/sdk/keyvault/azure-security-keyvault-certificates/samples/certificate-GetCertificates/certificate-GetCertificates.cpp
index 4adf25a08..0566eaec0 100644
--- a/sdk/keyvault/azure-security-keyvault-certificates/samples/certificate-GetCertificates/certificate-GetCertificates.cpp
+++ b/sdk/keyvault/azure-security-keyvault-certificates/samples/certificate-GetCertificates/certificate-GetCertificates.cpp
@@ -159,13 +159,6 @@ KeyVaultCertificateWithPolicy CreateCertificate(
     auto response = certificateClient.StartCreateCertificate(certificateName, params);
     auto result = response.PollUntilDone(defaultWait);
 
-    // check that the operation completed
-    while (!response.IsCompleted())
-    {
-      response.UpdateProperties();
-      std::this_thread::sleep_for(defaultWait);
-    }
-
     // get the certificate
     auto certificate = certificateClient.GetCertificate(certificateName).Value;
 
diff --git a/sdk/keyvault/azure-security-keyvault-certificates/samples/certificate-basic-operations/README.md b/sdk/keyvault/azure-security-keyvault-certificates/samples/certificate-basic-operations/README.md
index 570924d69..f5b5dfb45 100644
--- a/sdk/keyvault/azure-security-keyvault-certificates/samples/certificate-basic-operations/README.md
+++ b/sdk/keyvault/azure-security-keyvault-certificates/samples/certificate-basic-operations/README.md
@@ -42,13 +42,6 @@ CertificateCreateParameters params;
 // start the create process
 auto response = certificateClient.StartCreateCertificate(certificateName, params);
 auto result = response.PollUntilDone(defaultWait);
-
-// check that the operation completed
-while (!response.IsCompleted())
-{
-  response.UpdateProperties();
-  std::this_thread::sleep_for(defaultWait);
-}
 ```
 
 ## Getting a Certificate
diff --git a/sdk/keyvault/azure-security-keyvault-certificates/samples/certificate-basic-operations/certificate-basic-operations.cpp b/sdk/keyvault/azure-security-keyvault-certificates/samples/certificate-basic-operations/certificate-basic-operations.cpp
index 28d1c163e..6e6c1f8aa 100644
--- a/sdk/keyvault/azure-security-keyvault-certificates/samples/certificate-basic-operations/certificate-basic-operations.cpp
+++ b/sdk/keyvault/azure-security-keyvault-certificates/samples/certificate-basic-operations/certificate-basic-operations.cpp
@@ -69,13 +69,6 @@ int main()
       auto response = certificateClient.StartCreateCertificate(certificateName, params);
       auto result = response.PollUntilDone(defaultWait);
 
-      // check that the operation completed
-      while (!response.IsCompleted())
-      {
-        response.UpdateProperties();
-        std::this_thread::sleep_for(defaultWait);
-      }
-
       // get the certificate
       certificate = certificateClient.GetCertificate(certificateName).Value;
 
diff --git a/sdk/keyvault/azure-security-keyvault-certificates/src/certificate_client_operations.cpp b/sdk/keyvault/azure-security-keyvault-certificates/src/certificate_client_operations.cpp
index 3d8448f8d..06b6bdcfa 100644
--- a/sdk/keyvault/azure-security-keyvault-certificates/src/certificate_client_operations.cpp
+++ b/sdk/keyvault/azure-security-keyvault-certificates/src/certificate_client_operations.cpp
@@ -16,7 +16,7 @@ Azure::Response<CertificateOperationProperties> CreateCertificateOperation::Poll
   while (true)
   {
     Poll(context);
-    if (IsDone())
+    if (IsDone() && IsCompleted())
     {
       break;
     }
@@ -70,9 +70,9 @@ CreateCertificateOperation::CreateCertificateOperation(
     Azure::Response<CertificateOperationProperties> response)
     : m_certificateClient(certificateClient)
 {
-  Properties = response.Value;
+  m_value = response.Value;
   m_rawResponse = std::move(response.RawResponse);
-  m_continuationToken = Properties.Name;
+  m_continuationToken = m_value.Name;
 
   if (!m_value.Name.empty())
   {
@@ -97,43 +97,30 @@ CreateCertificateOperation CreateCertificateOperation::CreateFromResumeToken(
   return operation;
 }
 
-CertificateOperationProperties CreateCertificateOperation::UpdateProperties(
-    Azure::Core::Context const& context)
-{
-  if (IsCompleted())
-  {
-    return Properties;
-  }
-
-  auto response = m_certificateClient->GetPendingCertificateOperation(m_continuationToken, context);
-  Properties = response.Value;
-  return Properties;
-}
-
 void CreateCertificateOperation::Cancel(Azure::Core::Context const& context)
 {
   auto response
       = m_certificateClient->CancelPendingCertificateOperation(m_continuationToken, context);
-  Properties = response.Value;
+  m_value = response.Value;
 }
 void CreateCertificateOperation::Delete(Azure::Core::Context const& context)
 {
   auto response
       = m_certificateClient->DeletePendingCertificateOperation(m_continuationToken, context);
-  Properties = response.Value;
+  m_value = response.Value;
 }
 
 bool CreateCertificateOperation::IsCompleted() const
 {
   bool completed = false;
 
-  if (Properties.Status.HasValue()
-      && (Properties.Status.Value() == _detail::CompletedValue
-          || Properties.Status.Value() == _detail::DeletedValue))
+  if (m_value.Status
+      && (m_value.Status.Value() == _detail::CompletedValue
+          || m_value.Status.Value() == _detail::DeletedValue))
   {
     completed = true;
   }
-  if (Properties.Error.HasValue())
+  if (m_value.Error.HasValue())
   {
     completed = true;
   }
diff --git a/sdk/keyvault/azure-security-keyvault-certificates/test/ut/certificate_client_base_test.hpp b/sdk/keyvault/azure-security-keyvault-certificates/test/ut/certificate_client_base_test.hpp
index a1f775a22..301176dde 100644
--- a/sdk/keyvault/azure-security-keyvault-certificates/test/ut/certificate_client_base_test.hpp
+++ b/sdk/keyvault/azure-security-keyvault-certificates/test/ut/certificate_client_base_test.hpp
@@ -261,12 +261,6 @@ namespace Azure {
       auto response = client.StartCreateCertificate(name, params);
       auto result = response.PollUntilDone(defaultWait);
 
-      while (!response.IsCompleted())
-      {
-        response.UpdateProperties();
-        std::this_thread::sleep_for(defaultWait);
-      }
-
       auto cert = client.GetCertificate(name);
 
       EXPECT_EQ(cert.Value.Name(), params.Properties.Name);
diff --git a/sdk/keyvault/azure-security-keyvault-certificates/test/ut/certificate_client_test.cpp b/sdk/keyvault/azure-security-keyvault-certificates/test/ut/certificate_client_test.cpp
index 21b76ccfb..91fd37b73 100644
--- a/sdk/keyvault/azure-security-keyvault-certificates/test/ut/certificate_client_test.cpp
+++ b/sdk/keyvault/azure-security-keyvault-certificates/test/ut/certificate_client_test.cpp
@@ -68,11 +68,6 @@ TEST_F(KeyVaultCertificateClientTest, CreateCertificateResumeToken)
         = CreateCertificateOperation::CreateFromResumeToken(response.GetResumeToken(), client);
 
     auto result = fromToken.PollUntilDone(m_defaultWait);
-    while (!response.IsCompleted())
-    {
-      response.UpdateProperties();
-      std::this_thread::sleep_for(m_defaultWait);
-    }
 
     auto cert = client.GetCertificate(certificateName);
     EXPECT_EQ(cert.Value.Name(), params.Properties.Name);