diff --git a/libwvdrmengine/cdm/core/include/cdm_session.h b/libwvdrmengine/cdm/core/include/cdm_session.h
index fe8f4ada..e6f2bd6e 100644
--- a/libwvdrmengine/cdm/core/include/cdm_session.h
+++ b/libwvdrmengine/cdm/core/include/cdm_session.h
@@ -120,6 +120,7 @@ class CdmSession {
 
   // Used for certificate based licensing
   std::string wrapped_key_;
+  bool is_certificate_loaded_;
 
   std::set<WvCdmEventListener*> listeners_;
 
diff --git a/libwvdrmengine/cdm/core/src/cdm_session.cpp b/libwvdrmengine/cdm/core/src/cdm_session.cpp
index ded038d8..4ecce4a5 100644
--- a/libwvdrmengine/cdm/core/src/cdm_session.cpp
+++ b/libwvdrmengine/cdm/core/src/cdm_session.cpp
@@ -31,7 +31,8 @@ CdmSession::CdmSession(const CdmClientPropertySet* cdm_client_property_set)
       crypto_session_(NULL),
       license_received_(false),
       reinitialize_session_(false),
-      license_type_(kLicenseTypeStreaming) {
+      license_type_(kLicenseTypeStreaming),
+      is_certificate_loaded_(false) {
   if (cdm_client_property_set) {
     Properties::AddSessionPropertySet(session_id_, cdm_client_property_set);
   }
@@ -161,7 +162,11 @@ CdmResponseType CdmSession::GenerateKeyRequest(
     }
 
     if (Properties::use_certificates_as_identification()) {
-      if (!crypto_session_->LoadCertificatePrivateKey(wrapped_key_)) {
+      if (is_certificate_loaded_ ||
+          crypto_session_->LoadCertificatePrivateKey(wrapped_key_)) {
+        is_certificate_loaded_ = true;
+      }
+      else {
         reinitialize_session_ = true;
         return NEED_PROVISIONING;
       }